summaryrefslogtreecommitdiffstats
path: root/src/glx/dri3_glx.c
diff options
context:
space:
mode:
authorKeith Packard <[email protected]>2013-11-21 20:22:16 -0800
committerKenneth Graunke <[email protected]>2013-12-20 16:17:54 -0800
commit568a27588d13146d0fd7cb4e775e1ac0187e5e29 (patch)
tree06bca12d062d61a2082bbceb63a10761a8d3bbaa /src/glx/dri3_glx.c
parent9f330481c3979724300881891dfa17e99a5698ab (diff)
dri3: Switch to libxshmfence version 1.1
libxshmfence v1.0 foolishly used 'int32_t *' for the fence type, which works when the fence is a linux futex. However, version 1.1 changes the exported datatype to 'struct xshmfence *' Require libxshmfence version 1.1 and switch the API around. Signed-off-by: Keith Packard <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glx/dri3_glx.c')
-rw-r--r--src/glx/dri3_glx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index b047cc880c8..1834c6d4a8e 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -676,7 +676,7 @@ dri3_alloc_render_buffer(struct glx_screen *glx_screen, Drawable draw,
xcb_connection_t *c = XGetXCBConnection(dpy);
xcb_pixmap_t pixmap;
xcb_sync_fence_t sync_fence;
- int32_t *shm_fence;
+ struct xshmfence *shm_fence;
int buffer_fd, fence_fd;
int stride;
@@ -921,7 +921,7 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable,
struct dri3_screen *psc;
xcb_connection_t *c;
xcb_sync_fence_t sync_fence;
- int32_t *shm_fence;
+ struct xshmfence *shm_fence;
int fence_fd;
__DRIimage *image_planar;
int stride, offset;