diff options
| author | Robert Bragg <robert@linux.intel.com> | 2010-01-20 03:01:14 +0000 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-01-25 15:40:56 -0800 |
| commit | 7a9329ba99fe1242c07fbf4fd04e7a4dbeba2e72 (patch) | |
| tree | d5e6f61d16534c8d8f9422a7d7a0038a55047bcf /include | |
| parent | 9b22427911ad27efc1f36faee9462c6082d0417c (diff) | |
mesa: misc GLX_INTEL_swap_event fixes
Fixup a few issues found through testing:
- update GLX names to match glproto
- register DRI2WireToEvent so it actually gets called
Signed-off-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/glx.h | 6 | ||||
| -rw-r--r-- | include/GL/glxext.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/GL/glx.h b/include/GL/glx.h index 82b0f22114..fd53964ea0 100644 --- a/include/GL/glx.h +++ b/include/GL/glx.h @@ -518,8 +518,12 @@ typedef struct { } 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; - GLXDrawable drawable; int64_t ust; int64_t msc; int64_t sbc; diff --git a/include/GL/glxext.h b/include/GL/glxext.h index 36ee3665df..50740dd29d 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -698,10 +698,10 @@ typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawabl #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 +#define GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK 0x10000000 +#define GLX_EXCHANGE_COMPLETE_INTEL 0x8024 +#define GLX_BLIT_COMPLETE_INTEL 0x8025 +#define GLX_FLIP_COMPLETE_INTEL 0x8026 #endif #ifndef GLX_SGIX_swap_barrier |