ARB_fbo: Enable GL_EXT_framebuffer_multisample

All of this functionality is already included in ARB_fbo.  This just
enables the string.

I was a bit lazy in using FEATURE_ARB_framebuffer_object for this
feature as well.  I don't think it makes much difference in the long run.
This commit is contained in:
Ian Romanick
2009-11-11 15:33:23 -08:00
parent 7fd44005ae
commit 4d6ec21439
2 changed files with 7 additions and 2 deletions

View File

@@ -104,8 +104,9 @@ static const struct {
{ ON, "GL_EXT_copy_texture", F(EXT_copy_texture) }, { ON, "GL_EXT_copy_texture", F(EXT_copy_texture) },
{ OFF, "GL_EXT_depth_bounds_test", F(EXT_depth_bounds_test) }, { OFF, "GL_EXT_depth_bounds_test", F(EXT_depth_bounds_test) },
{ ON, "GL_EXT_draw_range_elements", F(EXT_draw_range_elements) }, { ON, "GL_EXT_draw_range_elements", F(EXT_draw_range_elements) },
{ OFF, "GL_EXT_framebuffer_object", F(EXT_framebuffer_object) },
{ OFF, "GL_EXT_framebuffer_blit", F(EXT_framebuffer_blit) }, { OFF, "GL_EXT_framebuffer_blit", F(EXT_framebuffer_blit) },
{ OFF, "GL_EXT_framebuffer_multisample", F(EXT_framebuffer_multisample) },
{ OFF, "GL_EXT_framebuffer_object", F(EXT_framebuffer_object) },
{ OFF, "GL_EXT_fog_coord", F(EXT_fog_coord) }, { OFF, "GL_EXT_fog_coord", F(EXT_fog_coord) },
{ OFF, "GL_EXT_gpu_program_parameters", F(EXT_gpu_program_parameters) }, { OFF, "GL_EXT_gpu_program_parameters", F(EXT_gpu_program_parameters) },
{ OFF, "GL_EXT_histogram", F(EXT_histogram) }, { OFF, "GL_EXT_histogram", F(EXT_histogram) },
@@ -274,6 +275,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
#endif #endif
#if FEATURE_EXT_framebuffer_blit #if FEATURE_EXT_framebuffer_blit
ctx->Extensions.EXT_framebuffer_blit = GL_TRUE; ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
#endif
#if FEATURE_ARB_framebuffer_object
ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
#endif #endif
ctx->Extensions.EXT_histogram = GL_TRUE; ctx->Extensions.EXT_histogram = GL_TRUE;
/*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/ /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/

View File

@@ -2412,9 +2412,10 @@ struct gl_extensions
GLboolean EXT_copy_texture; GLboolean EXT_copy_texture;
GLboolean EXT_depth_bounds_test; GLboolean EXT_depth_bounds_test;
GLboolean EXT_draw_range_elements; GLboolean EXT_draw_range_elements;
GLboolean EXT_framebuffer_object;
GLboolean EXT_fog_coord; GLboolean EXT_fog_coord;
GLboolean EXT_framebuffer_blit; GLboolean EXT_framebuffer_blit;
GLboolean EXT_framebuffer_multisample;
GLboolean EXT_framebuffer_object;
GLboolean EXT_gpu_program_parameters; GLboolean EXT_gpu_program_parameters;
GLboolean EXT_histogram; GLboolean EXT_histogram;
GLboolean EXT_multi_draw_arrays; GLboolean EXT_multi_draw_arrays;