summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-11-09 16:35:54 -0800
committerIan Romanick <[email protected]>2010-11-10 16:00:03 -0800
commitbcef51c3b891dcdb97fd9fce0f2b76f161b59af5 (patch)
tree9a90914fc9ef100e3d40c233751a7c2b4b42d15f /src/mesa/main
parent0faa7ada8419408070874d83dc2fcbad903f0dcc (diff)
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 <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/get.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 870c5d76f0a..b54af6ee86b 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -297,7 +297,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);
@@ -1142,7 +1142,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),