OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: Drop xcb ifdefs by just requiring a version from this year.

Browse Source 
glx and gallium's xcb_dri2 usage already require this version, so this is
nothing really new.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Eric Anholt
2012-09-25 09:09:47 -07:00
parent b49cd8495f
commit b477384f40
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -1508,7 +1508,7 @@ for plat in $egl_platforms; do
;; ;;
x11) 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 # workaround a bug in xcb-dri2 generated by xcb-proto 1.6
save_LIBS="$LIBS" save_LIBS="$LIBS"
AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [], AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],

13
src/egl/drivers/dri2/platform_x11.c
View File

@@ -695,7 +695,6 @@ static int64_t
dri2_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw, dri2_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw,
int64_t msc, int64_t divisor, int64_t remainder) 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_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
uint32_t msc_hi = msc >> 32; 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); (*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable);
return swap_count; 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 static EGLBoolean
@@ -802,10 +795,8 @@ dri2_post_sub_buffer(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw,
static EGLBoolean static EGLBoolean
dri2_swap_interval(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint interval) 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_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
#endif
/* XXX Check vblank_mode here? */ /* 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) else if (interval < surf->Config->MinSwapInterval)
interval = surf->Config->MinSwapInterval; interval = surf->Config->MinSwapInterval;
#if XCB_DRI2_MINOR_VERSION >= 3
if (interval != surf->SwapInterval && dri2_dpy->swap_available) if (interval != surf->SwapInterval && dri2_dpy->swap_available)
xcb_dri2_swap_interval(dri2_dpy->conn, dri2_surf->drawable, interval); xcb_dri2_swap_interval(dri2_dpy->conn, dri2_surf->drawable, interval);
#endif
surf->SwapInterval = interval; 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[1] = &image_lookup_extension.base;
dri2_dpy->extensions[2] = NULL; dri2_dpy->extensions[2] = NULL;
#if XCB_DRI2_MINOR_VERSION >= 3
dri2_dpy->swap_available = (dri2_dpy->dri2_minor >= 2); dri2_dpy->swap_available = (dri2_dpy->dri2_minor >= 2);
dri2_dpy->invalidate_available = (dri2_dpy->dri2_minor >= 3); dri2_dpy->invalidate_available = (dri2_dpy->dri2_minor >= 3);
#endif
if (!dri2_create_screen(disp)) if (!dri2_create_screen(disp))
goto cleanup_fd; goto cleanup_fd;