mesa: remove FEATURE_draw_read_buffer define.
authorOliver McFadden <oliver.mcfadden@linux.intel.com>
Tue, 11 Sep 2012 06:11:55 +0000 (09:11 +0300)
committerOliver McFadden <oliver.mcfadden@linux.intel.com>
Sat, 15 Sep 2012 09:56:44 +0000 (12:56 +0300)
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
src/mesa/main/api_exec.c
src/mesa/main/mfeatures.h

index c448189456685a32d39c2513516d94076f6b2ff2..e589701b32a5bc9fac5fa5437457102ed9056fe5 100644 (file)
@@ -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) {
index bfd7e2783ae6b1217418a4f897986ba2bb32c9d5..2742e5a160e8391739587a7729e8a1cf2b882caf 100644 (file)
@@ -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