summaryrefslogtreecommitdiff
path: root/include/GL/glxext.h
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2010-01-12 11:25:02 +0800
committerChia-I Wu <olvaffe@gmail.com>2010-01-12 11:25:02 +0800
commit562c127693200822f04a145db50add1be2425d7b (patch)
tree9441774fb212b17ddf2a364f06abc43f166cc00b /include/GL/glxext.h
parente5d351dcfde58777162552cf5cd2a9cd8299f4cd (diff)
parent077d6dd7508af88509dd0499c5dfbdaa186b4015 (diff)
Merge branch 'master' into opengl-es-v2
Conflicts: src/mesa/main/dd.h
Diffstat (limited to 'include/GL/glxext.h')
-rw-r--r--include/GL/glxext.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/GL/glxext.h b/include/GL/glxext.h
index 9ac0592e05..36ee3665df 100644
--- a/include/GL/glxext.h
+++ b/include/GL/glxext.h
@@ -696,6 +696,14 @@ extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
#endif
+#ifndef GLX_INTEL_swap_event
+#define GLX_INTEL_swap_event
+#define GLX_BUFFER_SWAP_COMPLETE_MASK 0x10000000
+#define GLX_EXCHANGE_COMPLETE 0x8024
+#define GLX_BLIT_COMPLETE 0x8025
+#define GLX_FLIP_COMPLETE 0x8026
+#endif
+
#ifndef GLX_SGIX_swap_barrier
#define GLX_SGIX_swap_barrier 1
#ifdef GLX_GLXEXT_PROTOTYPES