summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-08-15 09:50:19 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-08-16 09:06:41 +0200
commit8c409403217cf8c13e1d2dd306ad5e86b566c5c9 (patch)
tree9cb45768437ff0290e4c16acaba9d130ff18e5cc
parent9b784069ce76e1914eaafac0542458f6a84d9fc0 (diff)
dri2: Add __DRI_BUFFER_COUNT token
Remove definition from egl_dri2. Defining this is egl_dri2.h breaks as soon as a new dri2 buffer token is added like with commit 4501a5d6e8d00fd0d87625352ed5ba1a8861f72e.
-rw-r--r--include/GL/internal/dri_interface.h3
-rw-r--r--src/egl/drivers/dri2/egl_dri2.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 4fe9e943b55..eed159e11cd 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -694,6 +694,9 @@ struct __DRIswrastExtensionRec {
#define __DRI_BUFFER_DEPTH_STENCIL 9 /**< Only available with DRI2 1.1 */
#define __DRI_BUFFER_HIZ 10
+/* Inofficial and for internal use. Increase when adding a new buffer token. */
+#define __DRI_BUFFER_COUNT 11
+
struct __DRIbufferRec {
unsigned int attachment;
unsigned int name;
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index a7297188af2..db93eec14ba 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -123,8 +123,6 @@ enum wayland_buffer_type {
WL_BUFFER_THIRD,
WL_BUFFER_COUNT
};
-
-#define __DRI_BUFFER_COUNT 10
#endif
enum dri2_surface_type {