diff options
| author | Brian Paul <brianp@vmware.com> | 2013-01-28 11:32:13 -0700 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-02-13 21:48:37 +0100 |
| commit | adcf0a0cf464fb27762ae04d599f50f778c32481 (patch) | |
| tree | dcd7adbe36ed7bf7e096567e9d8928c577c46254 | |
| parent | 663e41547a2ff2ada167c078922b63aaf9a3f9fb (diff) | |
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 <jfonseca@vmware.com>
(cherry picked from commit c80bacba2ed88bccc92ab7a7151e14ad32729249)
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 7cac78280b..f7a271e6d8 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -504,7 +504,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; @@ -634,6 +633,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; |