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@chromium.org>
This commit is contained in:
Ian Romanick
2010-11-09 16:35:54 -08:00
parent 0faa7ada84
commit bcef51c3b8
+2 -2
View File
@@ -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),