mesa: Branch 'master'

Michel Daenzer daenzer at kemper.freedesktop.org
Sat Mar 10 07:08:43 PST 2007


 src/mesa/drivers/dri/i915tex/intel_buffers.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

New commits:
diff-tree 97775f9904c34f72e6e5a56a6fb8975b1834e5f4 (from ced8870a6accbc1f5af876e81e20606bf5a4663e)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Mar 10 16:06:38 2007 +0100

    i915tex: Fix build against released version of libdrm.

diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915tex/intel_buffers.c
index 1643957..53064c7 100644
--- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
@@ -43,6 +43,23 @@
 #include "vblank.h"
 
 
+/* This block can be removed when libdrm > 2.3.0 is required */
+
+#ifndef DRM_VBLANK_FLIP
+
+#define DRM_VBLANK_FLIP 0x8000000
+
+typedef struct drm_i915_flip {
+   int pipes;
+} drm_i915_flip_t;
+
+#undef DRM_IOCTL_I915_FLIP
+#define DRM_IOCTL_I915_FLIP DRM_IOW(DRM_COMMAND_BASE + DRM_I915_FLIP, \
+				    drm_i915_flip_t)
+
+#endif
+
+
 /**
  * XXX move this into a new dri/common/cliprects.c file.
  */


More information about the mesa-commit mailing list