From b477384f4059cfda668c616c5655f2ee493cf6d1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 25 Sep 2012 09:09:47 -0700 Subject: [PATCH] egl: Drop xcb ifdefs by just requiring a version from this year. glx and gallium's xcb_dri2 usage already require this version, so this is nothing really new. Reviewed-by: Chad Versace --- configure.ac | 2 +- src/egl/drivers/dri2/platform_x11.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index b2c499e5e40..54f6ea20bdb 100644 --- a/configure.ac +++ b/configure.ac @@ -1508,7 +1508,7 @@ for plat in $egl_platforms; do ;; x11) - PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes]) + PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= 1.8 xcb-xfixes]) # workaround a bug in xcb-dri2 generated by xcb-proto 1.6 save_LIBS="$LIBS" AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [], diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index b75c90c7340..2be6d095931 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -695,7 +695,6 @@ static int64_t dri2_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, int64_t msc, int64_t divisor, int64_t remainder) { -#if XCB_DRI2_MINOR_VERSION >= 3 struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw); uint32_t msc_hi = msc >> 32; @@ -734,12 +733,6 @@ dri2_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, (*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable); return swap_count; -#else - struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw); - - return dri2_copy_region(drv, disp, draw, dri2_surf->region) ? 0 : -1; -#endif /* XCB_DRI2_MINOR_VERSION >= 3 */ - } static EGLBoolean @@ -802,10 +795,8 @@ dri2_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, static EGLBoolean dri2_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval) { -#if XCB_DRI2_MINOR_VERSION >= 3 struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); -#endif /* XXX Check vblank_mode here? */ @@ -814,10 +805,8 @@ dri2_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint else if (interval < surf->Config->MinSwapInterval) interval = surf->Config->MinSwapInterval; -#if XCB_DRI2_MINOR_VERSION >= 3 if (interval != surf->SwapInterval && dri2_dpy->swap_available) xcb_dri2_swap_interval(dri2_dpy->conn, dri2_surf->drawable, interval); -#endif surf->SwapInterval = interval; @@ -1114,10 +1103,8 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp) dri2_dpy->extensions[1] = &image_lookup_extension.base; dri2_dpy->extensions[2] = NULL; -#if XCB_DRI2_MINOR_VERSION >= 3 dri2_dpy->swap_available = (dri2_dpy->dri2_minor >= 2); dri2_dpy->invalidate_available = (dri2_dpy->dri2_minor >= 3); -#endif if (!dri2_create_screen(disp)) goto cleanup_fd; -- 2.30.2