Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/main/api_exec.c | 2 +-
src/mesa/main/extensions.c | 4 ++--
src/mesa/main/mfeatures.h | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 560052b..091d980 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -770,7 +770,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
}
-#if FEATURE_ARB_framebuffer_object
+#if FEATURE_GL
/* The ARB_fbo functions are the union of
* GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array
*/
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f520a96..028701e 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -400,7 +400,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
+#if FEATURE_GL
ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
#endif
/* XXX re-enable when GLSL compiler again supports geometry shaders */
@@ -456,7 +456,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
+#if FEATURE_GL
ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
#endif
ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 1b1be52..5245c18 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
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
