Upgraded Mesa to 7.9 from 7.7 in order to pick up bug fixes to the...

third_party/mesa/MesaLib/include/GL/glx.h

 /*
  * Mesa 3-D graphics library
  * Version:  6.5
  * 
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ skipping 168 matching lines @@
 typedef XID GLXPixmap;
 typedef XID GLXDrawable;
 /* GLX 1.3 and later */
 typedef struct __GLXFBConfigRec *GLXFBConfig;
 typedef XID GLXFBConfigID;
 typedef XID GLXContextID;
 typedef XID GLXWindow;
 typedef XID GLXPbuffer;
 
 
+/*
+** Events.
+** __GLX_NUMBER_EVENTS is set to 17 to account for the BufferClobberSGIX
+**  event - this helps initialization if the server supports the pbuffer
+**  extension and the client doesn't.
+*/
+#define GLX_PbufferClobber      0
+#define GLX_BufferSwapComplete  1
+
+#define __GLX_NUMBER_EVENTS 17
 
 extern XVisualInfo* glXChooseVisual( Display *dpy, int screen,
                                      int *attribList );
 
 extern GLXContext glXCreateContext( Display *dpy, XVisualInfo *vis,
                                     GLXContext shareList, Bool direct );
 
 extern void glXDestroyContext( Display *dpy, GLXContext ctx );
 
 extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
@@ skipping 152 matching lines @@
 
 extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
 extern void glXFreeMemoryNV(GLvoid *pointer);
 typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
 typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
 
 #endif /* GLX_NV_vertex_array_range */
 
 
 /*
- * ???. GLX_MESA_allocate_memory
- */ 
-#ifndef GLX_MESA_allocate_memory
-#define GLX_MESA_allocate_memory 1
-
-extern void *glXAllocateMemoryMESA(Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
-extern GLuint glXGetMemoryOffsetMESA(Display *dpy, int scrn, const void *pointer);
-typedef void * ( * PFNGLXALLOCATEMEMORYMESAPROC) (Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-typedef void ( * PFNGLXFREEMEMORYMESAPROC) (Display *dpy, int scrn, void *pointer);
-typedef GLuint (* PFNGLXGETMEMORYOFFSETMESAPROC) (Display *dpy, int scrn, const void *pointer);
-
-#endif /* GLX_MESA_allocate_memory */
-
-
-/*
  * ARB ?. GLX_ARB_render_texture
  * XXX This was never finalized!
  */
 #ifndef GLX_ARB_render_texture
 #define GLX_ARB_render_texture 1
 
 extern Bool glXBindTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
 extern Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
 extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attribList);
 
@@ skipping 113 matching lines @@
     Bool send_event;            /* true if this came for SendEvent request */
     Display *display;           /* display the event was read from */
     GLXDrawable drawable;       /* XID of Drawable */
     unsigned int buffer_mask;   /* mask indicating which buffers are affected */
     unsigned int aux_buffer;    /* which aux buffer was affected */
     int x, y;
     int width, height;
     int count;                  /* if nonzero, at least this many more */
 } GLXPbufferClobberEvent;
 
+typedef struct {
+    int type;
+    unsigned long serial;       /* # of last request processed by server */
+    Bool send_event;            /* true if this came from a SendEvent request */
+    Display *display;           /* Display the event was read from */
+    GLXDrawable drawable;       /* drawable on which event was requested in event mask */
+    int event_type;
+    int64_t ust;
+    int64_t msc;
+    int64_t sbc;
+} GLXBufferSwapComplete;
+
 typedef union __GLXEvent {
     GLXPbufferClobberEvent glxpbufferclobber;
+    GLXBufferSwapComplete glxbufferswapcomplete;
     long pad[24];
 } GLXEvent;
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif