<div dir="ltr">On 10 September 2013 12:10, Ian Romanick <span dir="ltr"><<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</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">From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
<br>
Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>><br>
---<br>
src/mesa/main/get.c | 4 ----<br>
src/mesa/main/get_hash_params.py | 2 +-<br>
2 files changed, 1 insertion(+), 5 deletions(-)<br>
<br>
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c<br>
index 34eb6be..ae45bf8 100644<br>
--- a/src/mesa/main/get.c<br>
+++ b/src/mesa/main/get.c<br>
@@ -718,10 +718,6 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu<br>
ASSERT(v->value_int_n.n <= ARRAY_SIZE(v->value_int_n.ints));<br>
break;<br>
<br>
- case GL_MAX_VARYING_FLOATS_ARB:<br>
- v->value_int = ctx->Const.MaxVarying * 4;<br>
- break;<br>
-<br>
/* Various object names */<br>
<br>
case GL_TEXTURE_BINDING_1D:<br>
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py<br>
index c0dbf45..3d47443 100644<br>
--- a/src/mesa/main/get_hash_params.py<br>
+++ b/src/mesa/main/get_hash_params.py<br>
@@ -365,7 +365,7 @@ descriptor=[<br>
<br>
# GL_ARB_vertex_shader<br>
[ "MAX_VERTEX_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.VertexProgram.MaxUniformComponents), extra_ARB_vertex_shader" ],<br>
- [ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_vertex_shader" ],<br>
+ [ "MAX_VARYING_FLOATS_ARB", "CONTEXT_INT(Const.VertexProgram.MaxOutputComponents), extra_ARB_vertex_shader" ],<br>
<br>
# GL_EXT_framebuffer_blit<br>
# NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.1.4<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 class="gmail_extra"><br>Doesn't MAX_VARYING_FLOATS need to be MIN2(MAX_VERTEX_OUTPUT_COMPONENTS, MAX_FRAGMENT_INPUT_COMPONENTS)? I can imagine an implementation where MAX_FRAGMENT_INPUT_COMPONENTS is the smaller constraint (in fact, ES3's minimum maximums constitute just such a case).<br>
</div></div>