OLD | NEW |
(Empty) | |
| 1 From bcef51c3b891dcdb97fd9fce0f2b76f161b59af5 Mon Sep 17 00:00:00 2001 |
| 2 From: Ian Romanick <ian.d.romanick@intel.com> |
| 3 Date: Wed, 10 Nov 2010 00:35:54 +0000 |
| 4 Subject: mesa: Allow query of MAX_SAMPLES with EXT_framebuffer_multisample |
| 5 |
| 6 Previously queries of MAX_SAMPLES were only allowed with |
| 7 ARB_framebuffer_object, but EXT_framebuffer_multisample also enables |
| 8 this query. This seems to only effect the i915. All other drivers |
| 9 support both extensions or neither extension. |
| 10 |
| 11 This patch is based on a patch that Kenneth sent along with the report. |
| 12 |
| 13 NOTE: this is a candidate for the 7.9 branch. |
| 14 |
| 15 Reported-by: Kenneth Waters <kwaters@chromium.org> |
| 16 --- |
| 17 diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c |
| 18 index 870c5d7..b54af6e 100644 |
| 19 --- a/src/mesa/main/get.c |
| 20 +++ b/src/mesa/main/get.c |
| 21 @@ -297,7 +297,7 @@ EXTRA_EXT(ARB_shader_objects); |
| 22 EXTRA_EXT(EXT_provoking_vertex); |
| 23 EXTRA_EXT(ARB_fragment_shader); |
| 24 EXTRA_EXT(ARB_fragment_program); |
| 25 -EXTRA_EXT(ARB_framebuffer_object); |
| 26 +EXTRA_EXT2(ARB_framebuffer_object, EXT_framebuffer_multisample); |
| 27 EXTRA_EXT(EXT_framebuffer_object); |
| 28 EXTRA_EXT(APPLE_vertex_array_object); |
| 29 EXTRA_EXT(ARB_seamless_cube_map); |
| 30 @@ -1142,7 +1142,7 @@ static const struct value_desc values[] = { |
| 31 |
| 32 /* GL_ARB_framebuffer_object */ |
| 33 { GL_MAX_SAMPLES, CONTEXT_INT(Const.MaxSamples), |
| 34 - extra_ARB_framebuffer_object }, |
| 35 + extra_ARB_framebuffer_object_EXT_framebuffer_multisample }, |
| 36 |
| 37 /* GL_APPLE_vertex_array_object */ |
| 38 { GL_VERTEX_ARRAY_BINDING_APPLE, ARRAY_INT(Name), |
| 39 -- |
| 40 cgit v0.8.3-6-g21f6 |
OLD | NEW |