From bcef51c3b891dcdb97fd9fce0f2b76f161b59af5 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 9 Nov 2010 16:35:54 -0800 Subject: 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 --- src/mesa/main/get.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 870c5d76f0..b54af6ee86 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), -- cgit v1.2.3