Index: third_party/mesa/MesaLib/include/GL/glx.h |
=================================================================== |
--- third_party/mesa/MesaLib/include/GL/glx.h (revision 63788) |
+++ third_party/mesa/MesaLib/include/GL/glx.h (working copy) |
@@ -186,7 +186,17 @@ |
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 ); |
@@ -358,22 +368,6 @@ |
/* |
- * ???. 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! |
*/ |
@@ -507,8 +501,21 @@ |
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; |