From: Brian Paul <brianp@vmware.com>
Date: Mon, 11 Feb 2013 19:29:20 +0000 (-0700)
Subject: mesa: don't enable GL_EXT_framebuffer_multisample for software drivers
X-Git-Tag: accepted/2.0alpha-wayland/20130301.050525~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=663e41547a2ff2ada167c078922b63aaf9a3f9fb;p=profile%2Fivi%2Fmesa.git

mesa: don't enable GL_EXT_framebuffer_multisample for software drivers

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
---

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 057d82c..8fe752d 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -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;