<div dir="ltr">On 29 December 2012 04:35, Chris Forbes <span dir="ltr"><<a href="mailto:chrisf@ijw.co.nz" target="_blank">chrisf@ijw.co.nz</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Chris Forbes <<a href="mailto:chrisf@ijw.co.nz">chrisf@ijw.co.nz</a>><br>
---<br>
src/mesa/main/get.c | 9 +++++++++<br>
src/mesa/main/get_hash_params.py | 5 +++++<br>
2 files changed, 14 insertions(+)<br>
<br>
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c<br>
index 273a79f..4c227a8 100644<br>
--- a/src/mesa/main/get.c<br>
+++ b/src/mesa/main/get.c<br>
@@ -337,6 +337,7 @@ EXTRA_EXT(ARB_uniform_buffer_object);<br>
EXTRA_EXT(ARB_timer_query);<br>
EXTRA_EXT(ARB_map_buffer_alignment);<br>
EXTRA_EXT(ARB_texture_cube_map_array);<br>
+EXTRA_EXT(ARB_texture_multisample);<br>
<br>
static const int<br>
extra_NV_primitive_restart[] = {<br>
@@ -796,6 +797,14 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu<br>
.CurrentTex[TEXTURE_BUFFER_INDEX]->BufferObjectFormat;<br>
break;<br>
<br>
+ /* GL_ARB_texture_multisample */<br>
+ case GL_TEXTURE_BINDING_2D_MULTISAMPLE:<br>
+ case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY:<br>
+ unit = ctx->Texture.CurrentUnit;<br>
+ v->value_int =<br>
+ ctx->Texture.Unit[unit].CurrentTex[d->offset]->Name;<br>
+ break;<br>
+<br></blockquote><div><br></div><div>This block looks identical to the existing block that handles GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, etc. Rather than duplicate code, we should just add two new cases to the existing block.<br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
/* GL_ARB_sampler_objects */<br>
case GL_SAMPLER_BINDING:<br>
{<br>
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py<br>
index ac9c79c..40e25e7 100644<br>
--- a/src/mesa/main/get_hash_params.py<br>
+++ b/src/mesa/main/get_hash_params.py<br>
@@ -638,6 +638,11 @@ descriptor=[<br>
[ "TEXTURE_BUFFER_FORMAT_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_texture_buffer_object" ],<br>
[ "TEXTURE_BUFFER_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_texture_buffer_object" ],<br>
<br>
+# GL_ARB_texture_multisample<br>
+ [ "TEXTURE_BINDING_2D_MULTISAMPLE", "LOC_CUSTOM, TYPE_INT, TEXTURE_2D_MULTISAMPLE_INDEX, extra_ARB_texture_multisample" ],<br>
+ [ "TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY", "LOC_CUSTOM, TYPE_INT, TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX, extra_ARB_texture_multisample" ],<br>
+<br>
+<br>
# GL_ARB_sampler_objects / GL 3.3<br>
[ "SAMPLER_BINDING", "LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, NO_EXTRA" ],<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.8.0.3<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>