arb_arrays_of_arrays: allow for eliminated inactive uniforms

This fixes the test so it passes on the Nvidia binary driver.

1 files changed, 1 insertions, 15 deletions

diff --git a/tests/spec/arb_arrays_of_arrays/execution/sampler/fs-mixed-const-and-non-const-index2.shader_test b/tests/spec/arb_arrays_of_arrays/execution/sampler/fs-mixed-const-and-non-const-index2.shader_test
index 7094ab46f..e89eec24b 100644
--- a/tests/spec/arb_arrays_of_arrays/execution/sampler/fs-mixed-const-and-non-const-index2.shader_test
+++ b/tests/spec/arb_arrays_of_arrays/execution/sampler/fs-mixed-const-and-non-const-index2.shader_test
@@ -28,19 +28,9 @@ void main()
 clear color 0.2 0.2 0.2 0.2
 clear
 
-uniform int s[0][0] 0
-uniform int s[0][1] 1
 uniform int s[1][0] 2
 uniform int s[1][1] 3
 
-texture checkerboard 0 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (1.0, 0.0, 0.0, 0.0)
-texparameter 2D min nearest
-texparameter 2D mag nearest
-
-texture checkerboard 1 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 1.0, 0.0, 0.0)
-texparameter 2D min nearest
-texparameter 2D mag nearest
-
 texture checkerboard 2 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 0.0, 1.0, 0.0)
 texparameter 2D min nearest
 texparameter 2D mag nearest
@@ -51,12 +41,8 @@ texparameter 2D mag nearest
 
 uniform int n 0
 draw rect -1 0 1 1
-# real outcome?
-relative probe rect rgb (0.0, 0.5, 0.5, 0.5) (0.0, 0.0, 1.0)
 
-#uniform int n 0
-#draw rect 0 -1 1 1
-#relative probe rect rgb (0.0, 0.5, 0.5, 0.5) (0.0, 1.0, 0.0)
+relative probe rect rgb (0.0, 0.5, 0.5, 0.5) (0.0, 0.0, 1.0)
 
 uniform int n 1
 draw rect 0 0 1 1