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.

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 4fe9e943b55888220a1b83391f50813d858764a9..eed159e11cdd480dd5e51cd6410f156d1d65e95a 100644 (file)
--- 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 a7297188af284f87133fbbe43930b8a096a56a39..db93eec14ba4c3ed333ba8320f27c99e39e0661f 100644 (file)
--- 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 {