Mesa (7.9): mesa: Allow query of MAX_SAMPLES with EXT_framebuffer_multisample
Ian Romanick
idr at kemper.freedesktop.org
Wed Dec 15 22:06:30 UTC 2010
Module: Mesa
Branch: 7.9
Commit: 639e65e054884fa1006b8f442be93f522e5bc0ec
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=639e65e054884fa1006b8f442be93f522e5bc0ec
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Nov 9 16:35:54 2010 -0800
mesa: Allow query of MAX_SAMPLES with EXT_framebuffer_multisample
Previously queries of MAX_SAMPLES were only allowed with
ARB_framebuffer_object, but EXT_framebuffer_multisample also enables
this query. This seems to only effect the i915. All other drivers
support both extensions or neither extension.
This patch is based on a patch that Kenneth sent along with the report.
NOTE: this is a candidate for the 7.9 branch.
Reported-by: Kenneth Waters <kwaters at chromium.org>
(cherry picked from commit bcef51c3b891dcdb97fd9fce0f2b76f161b59af5)
---
src/mesa/main/get.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 073f481..28e25c8 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -288,7 +288,7 @@ EXTRA_EXT(ARB_shader_objects);
EXTRA_EXT(EXT_provoking_vertex);
EXTRA_EXT(ARB_fragment_shader);
EXTRA_EXT(ARB_fragment_program);
-EXTRA_EXT(ARB_framebuffer_object);
+EXTRA_EXT2(ARB_framebuffer_object, EXT_framebuffer_multisample);
EXTRA_EXT(EXT_framebuffer_object);
EXTRA_EXT(APPLE_vertex_array_object);
EXTRA_EXT(ARB_seamless_cube_map);
@@ -1193,7 +1193,7 @@ static const struct value_desc values[] = {
/* GL_ARB_framebuffer_object */
{ GL_MAX_SAMPLES, CONTEXT_INT(Const.MaxSamples),
- extra_ARB_framebuffer_object },
+ extra_ARB_framebuffer_object_EXT_framebuffer_multisample },
/* GL_APPLE_vertex_array_object */
{ GL_VERTEX_ARRAY_BINDING_APPLE, ARRAY_INT(Name),
More information about the mesa-commit
mailing list