diff options
| author | Oliver McFadden <[email protected]> | 2012-09-11 11:02:27 +0300 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2012-09-15 12:57:39 +0300 |
| commit | 32c3ba87531f76c104a78fb57673715f6115cccc (patch) | |
| tree | 51feeb1d75867d667e8e18e53b56589802315b34 | |
| parent | e8a72d8282d1be401825f4c2c32544b01e2e56bc (diff) | |
mesa: remove FEATURE_ARB_framebuffer_object define.
Signed-off-by: Oliver McFadden <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/main/api_exec.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/extensions.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 1 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index d236dd7af87..1ceb4944689 100644 --- 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 8433d9e90f7..75437b32e1a 100644 --- 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 1b1be52fa80..5245c18e232 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_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 |