[Mesa-dev] [PATCH] dri2: Add __DRI_BUFFER_COUNT token

2011-08-15 Thread Benjamin Franzke 
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.
---
 include/GL/internal/dri_interface.h |1 +
 src/egl/drivers/dri2/egl_dri2.h |2 --
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/include/GL/internal/dri_interface.h 
b/include/GL/internal/dri_interface.h
index 4fe9e94..6d8c614 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -693,6 +693,7 @@ struct __DRIswrastExtensionRec {
 #define __DRI_BUFFER_FAKE_FRONT_RIGHT  8
 #define __DRI_BUFFER_DEPTH_STENCIL 9  /** Only available with DRI2 1.1 */
 #define __DRI_BUFFER_HIZ   10
+#define __DRI_BUFFER_COUNT 11
 
 struct __DRIbufferRec {
 unsigned int attachment;
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index a729718..db93eec 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 {
-- 
1.7.3.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] dri2: Add __DRI_BUFFER_COUNT token

2011-08-15 Thread Michel Dänzer 
On Mon, 2011-08-15 at 09:57 +0200, Benjamin Franzke wrote: 
 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.
 ---
  include/GL/internal/dri_interface.h |1 +
  src/egl/drivers/dri2/egl_dri2.h |2 --
  2 files changed, 1 insertions(+), 2 deletions(-)
 
 diff --git a/include/GL/internal/dri_interface.h 
 b/include/GL/internal/dri_interface.h
 index 4fe9e94..6d8c614 100644
 --- a/include/GL/internal/dri_interface.h
 +++ b/include/GL/internal/dri_interface.h
 @@ -693,6 +693,7 @@ struct __DRIswrastExtensionRec {
  #define __DRI_BUFFER_FAKE_FRONT_RIGHT8
  #define __DRI_BUFFER_DEPTH_STENCIL   9  /** Only available with DRI2 1.1 */
  #define __DRI_BUFFER_HIZ 10
 +#define __DRI_BUFFER_COUNT   11

Maybe this should be separated from the other __DRI_BUFFER_* defines by
whitespace and a comment explaining what it's about, to prevent the next
buffer type from being added after __DRI_BUFFER_COUNT as

#define __DRI_BUFFER_FOO 12

:)


-- 
Earthling Michel Dänzer   |   http://www.amd.com
Libre software enthusiast |  Debian, X and DRI developer
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev