On 4 November 2011 16:56, Ian Romanick <<a href="mailto:idr@freedesktop.org">idr@freedesktop.org</a>> wrote: <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>> Optimizing GLSL linkers may reduce the size of the uniform array if tail elements are not accessed. Shader runner will fail the test if one of the set uniforms doesn't have a location. Previously these tests would fail on AMD's closed-source driver for this reason. Now they pass. Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com">ian.d.romanick@intel.com</a>> --- tests/shaders/glsl-fs-uniform-array-1.shader_test | 5 +++-- tests/shaders/glsl-vs-uniform-array-1.shader_test | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/shaders/glsl-fs-uniform-array-1.shader_test b/tests/shaders/glsl-fs-uniform-array-1.shader_test index b992588..3ab81d8 100644 --- a/tests/shaders/glsl-fs-uniform-array-1.shader_test +++ b/tests/shaders/glsl-fs-uniform-array-1.shader_test @@ -17,7 +17,8 @@ void main() [test] uniform vec4 arg[0] 1.0 0.0 0.0 0.0 uniform vec4 arg[1] 0.0 1.0 0.0 0.0 -uniform vec4 arg[2] 0.0 0.0 1.0 0.0 -uniform vec4 arg<a href="tel:%5B3%5D%201.0%200.0%201.0" value="+13100010">[3] 1.0 0.0 1.0</a> 0.0 +# The linker should optimize these members away, so don't set them. +#uniform vec4 arg[2] 0.0 0.0 1.0 0.0 +#uniform vec4 arg<a href="tel:%5B3%5D%201.0%200.0%201.0" value="+13100010">[3] 1.0 0.0 1.0</a> 0.0 draw rect -1 -1 2 2 probe rgb 1 1 0.0 1.0 0.0 diff --git a/tests/shaders/glsl-vs-uniform-array-1.shader_test b/tests/shaders/glsl-vs-uniform-array-1.shader_test index 6719395..7c7bcdc 100644 --- a/tests/shaders/glsl-vs-uniform-array-1.shader_test +++ b/tests/shaders/glsl-vs-uniform-array-1.shader_test @@ -20,7 +20,8 @@ void main() [test] uniform vec4 arg[0] 1.0 0.0 0.0 0.0 uniform vec4 arg[1] 0.0 1.0 0.0 0.0 -uniform vec4 arg[2] 0.0 0.0 1.0 0.0 -uniform vec4 arg<a href="tel:%5B3%5D%201.0%200.0%201.0" value="+13100010">[3] 1.0 0.0 1.0</a> 0.0 +# The linker should optimize these members away, so don't set them. +#uniform vec4 arg[2] 0.0 0.0 1.0 0.0 +#uniform vec4 arg<a href="tel:%5B3%5D%201.0%200.0%201.0" value="+13100010">[3] 1.0 0.0 1.0</a> 0.0 draw rect -1 -1 2 2 probe rgb 1 1 0.0 1.0 0.0 -- 1.7.6.4 </blockquote><div> Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>> </div></div>