From: Benjamin Franzke Date: Mon, 15 Aug 2011 07:50:19 +0000 (+0200) Subject: dri2: Add __DRI_BUFFER_COUNT token X-Git-Tag: 062012170305~4896^2~283 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c409403217cf8c13e1d2dd306ad5e86b566c5c9;p=profile%2Fivi%2Fmesa.git 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 4fe9e94..eed159e 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 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 {