From c80bacba2ed88bccc92ab7a7151e14ad32729249 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 28 Jan 2013 11:32:13 -0700 Subject: [PATCH] st/mesa: only enable GL_EXT_framebuffer_multisample if GL_MAX_SAMPLES >= 2 We never really have multisampling with one sample per pixel. See also http://bugs.freedesktop.org/show_bug.cgi?id=59873 Note: This is a candidate for the 9.0 branch. Reviewed-by: Jose Fonseca --- src/mesa/state_tracker/st_extensions.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index f0d8a4cae1d..34c0d7b4052 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -534,7 +534,6 @@ void st_init_extensions(struct st_context *st) ctx->Extensions.EXT_blend_minmax = GL_TRUE; ctx->Extensions.EXT_framebuffer_blit = GL_TRUE; ctx->Extensions.EXT_framebuffer_object = GL_TRUE; - ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE; ctx->Extensions.EXT_fog_coord = GL_TRUE; ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE; ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE; @@ -657,6 +656,9 @@ void st_init_extensions(struct st_context *st) /* one sample doesn't really make sense */ ctx->Const.MaxSamples = 0; } + else if (ctx->Const.MaxSamples >= 2) { + ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE; + } if (ctx->Const.MaxDualSourceDrawBuffers > 0) ctx->Extensions.ARB_blend_func_extended = GL_TRUE; -- 2.30.2