mesa: remove FEATURE_ARB_framebuffer_object define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index d236dd7af87793768f60e205566e3a7519ff0a11..1ceb494468999ed17ea0fc73ab64e6b4c293439a 100644 (file)
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -96,9 +96,6 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_GL || FEATURE_ES2
-
-
 /**
  * Initialize a dispatch table with pointers to Mesa's immediate-mode
  * commands.
@@ -757,14 +754,12 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
    }
 
-#if FEATURE_ARB_framebuffer_object
    /* The ARB_fbo functions are the union of
     * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array
     */
    if (ctx->API != API_OPENGLES2) {
       SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample);
    }
-#endif
 
 #if FEATURE_ARB_map_buffer_range
    if (ctx->API != API_OPENGLES2) {
@@ -898,5 +893,3 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    return exec;
 }
-
-#endif /* FEATURE_GL || FEATURE_ES2 */

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 8433d9e90f737d6316b0622d149df275ac25207d..75437b32e1aa0f24e52db3f1effaf3b40116ff85 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -398,9 +398,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
    ctx->Extensions.ARB_fragment_program = GL_TRUE;
    ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
    ctx->Extensions.ARB_fragment_shader = GL_TRUE;
-#if FEATURE_ARB_framebuffer_object
    ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
-#endif
    /* XXX re-enable when GLSL compiler again supports geometry shaders */
 #if 0
    ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
@@ -452,9 +450,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
 #if FEATURE_EXT_framebuffer_blit
    ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
 #endif
-#if FEATURE_ARB_framebuffer_object
    ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
-#endif
    ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
    ctx->Extensions.EXT_point_parameters = GL_TRUE;

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 1b1be52fa803cffe54613a6c2dab5f80b5e7e662..5245c18e232f9a4d964613fcf9d6f63948e96a43 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_ARB_framebuffer_object    FEATURE_GL
 #define FEATURE_ARB_map_buffer_range      FEATURE_GL
 #define FEATURE_ARB_pixel_buffer_object   FEATURE_GL
 #define FEATURE_ARB_sampler_objects       FEATURE_GL