mesa: don't enable GL_EXT_framebuffer_multisample for software drivers
authorBrian Paul <brianp@vmware.com>
Mon, 11 Feb 2013 19:29:20 +0000 (12:29 -0700)
committerAndreas Boll <andreas.boll.dev@gmail.com>
Wed, 13 Feb 2013 20:48:37 +0000 (21:48 +0100)
Note: This is a candidate for the 9.0 branch.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
(cherry picked from commit 8f3c81d0182b10d99976dd0a80f10eebebf54017)

Conflicts:

src/mesa/main/extensions.c

src/mesa/main/extensions.c

index 057d82c..8fe752d 100644 (file)
@@ -472,9 +472,6 @@ _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;
 #if FEATURE_EXT_pixel_buffer_object
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;