Module: Mesa
Branch: master
Commit: b49cd8495f2f01a55d126d42ea97a071c6723376
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b49cd8495f2f01a55d126d42ea97a071c6723376
Author: Eric Anholt <e...@anholt.net>
Date: Tue Sep 25 09:01:20 2012 -0700
egl: Unifdef dri_interface.h defines.
dri_interface.h comes from our tree, so why litter our tree with ifdefs for
older versions of it?
Reviewed-by: Kristian Høgsberg <k...@bitplanet.net>
Reviewed-by: Chad Versace <chad.vers...@linux.intel.com>
---
src/egl/drivers/dri2/platform_x11.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/egl/drivers/dri2/platform_x11.c
b/src/egl/drivers/dri2/platform_x11.c
index 15013ec..b75c90c 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -673,10 +673,8 @@ dri2_copy_region(_EGLDriver *drv, _EGLDisplay *disp,
if (draw->Type == EGL_PIXMAP_BIT || draw->Type == EGL_PBUFFER_BIT)
return EGL_TRUE;
-#ifdef __DRI2_FLUSH
if (dri2_dpy->flush)
(*dri2_dpy->flush->flush)(dri2_surf->dri_drawable);
-#endif
if (dri2_surf->have_fake_front)
render_attachment = XCB_DRI2_ATTACHMENT_BUFFER_FAKE_FRONT_LEFT;
@@ -717,10 +715,8 @@ dri2_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *draw,
if (draw->SwapBehavior == EGL_BUFFER_PRESERVED || !dri2_dpy->swap_available)
return dri2_copy_region(drv, disp, draw, dri2_surf->region) ? 0 : -1;
-#ifdef __DRI2_FLUSH
if (dri2_dpy->flush)
(*dri2_dpy->flush->flush)(dri2_surf->dri_drawable);
-#endif
cookie = xcb_dri2_swap_buffers_unchecked(dri2_dpy->conn,
dri2_surf->drawable,
msc_hi, msc_lo, divisor_hi, divisor_lo, remainder_hi,
remainder_lo);
@@ -732,12 +728,10 @@ dri2_swap_buffers_msc(_EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *draw,
free(reply);
}
-#if __DRI2_FLUSH_VERSION >= 3
/* If the server doesn't send invalidate events */
if (dri2_dpy->invalidate_available && dri2_dpy->flush &&
dri2_dpy->flush->base.version >= 3 && dri2_dpy->flush->invalidate)
(*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable);
-#endif
return swap_count;
#else
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
