[Mesa-dev] [PATCH 11/47] mesa: remove FEATURE_draw_read_buffer define.

Oliver McFadden oliver.mcfadden at linux.intel.com
Thu Sep 13 01:18:40 PDT 2012


Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
---
 src/mesa/main/api_exec.c  |    7 -------
 src/mesa/main/mfeatures.h |    1 -
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index c448189..e589701 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -41,9 +41,7 @@
 #include "blend.h"
 #include "bufferobj.h"
 #include "arrayobj.h"
-#if FEATURE_draw_read_buffer
 #include "buffers.h"
-#endif
 #include "clear.h"
 #include "clip.h"
 #include "colortab.h"
@@ -144,12 +142,9 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_ColorMask(exec, _mesa_ColorMask);
    SET_CullFace(exec, _mesa_CullFace);
    SET_Disable(exec, _mesa_Disable);
-#if FEATURE_draw_read_buffer
    if (ctx->API == API_OPENGL || ctx->API == API_OPENGL_CORE)
       SET_DrawBuffer(exec, _mesa_DrawBuffer);
-
    SET_ReadBuffer(exec, _mesa_ReadBuffer);
-#endif
    SET_Enable(exec, _mesa_Enable);
    SET_Finish(exec, _mesa_Finish);
    SET_Flush(exec, _mesa_Flush);
@@ -703,9 +698,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* ARB 37. GL_ARB_draw_buffers */
-#if FEATURE_draw_read_buffer
    SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
-#endif
 
    /* ARB 66. GL_ARB_sync */
    if (ctx->API != API_OPENGLES2) {
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index bfd7e27..2742e5a 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_draw_read_buffer          FEATURE_GL
 #define FEATURE_drawpix                   FEATURE_GL
 #define FEATURE_evaluators                FEATURE_GL
 #define FEATURE_feedback                  FEATURE_GL
-- 
1.7.8.6



More information about the mesa-dev mailing list