[Piglit] [PATCH 1/2] arb_gpu_shader5: Reorder probes in UBO and sampler indexing vs-nonuniform-control-flow tests.

[Francisco Jerez]

So that the ordering of pixel probes matches the ordering of vertex
arrays.  This should make the next commit easier to review.
---
 .../vs-nonuniform-control-flow.shader_test         | 42 +++++++++++-----------
 .../vs-nonuniform-control-flow.shader_test         | 42 +++++++++++-----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/vs-nonuniform-control-flow.shader_test b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/vs-nonuniform-control-flow.shader_test
index 07710db..1c81186 100644
--- a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/vs-nonuniform-control-flow.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/vs-nonuniform-control-flow.shader_test
@@ -137,35 +137,35 @@ draw arrays GL_POINTS 0 48
 # the implementation doesn't take this possibility into account.
 # Probe a bunch of pixels for good measure.
 #
-relative probe rgba (0.1, 0.0) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.3, 0.0) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.5, 0.0) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.7, 0.0) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.1) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.2, 0.1) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.4, 0.1) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.6, 0.1) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.1, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.2, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.3, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.4, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.5, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.6, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.7, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.1, 0.3) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.3, 0.3) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.5, 0.3) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.7, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.4) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.2, 0.4) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.4, 0.4) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.6, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.1, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.1, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.1, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.1, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.2, 0.1) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.2, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.2, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.2, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.3, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.3, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.3, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.3, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.4, 0.1) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.4, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.4, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.4, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.5, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.5, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.5, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.5, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.6, 0.1) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.6, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.6, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.6, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.7, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.7, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.7, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.7, 0.5) (0.4, 0.6, 0.8, 0.2)
diff --git a/tests/spec/arb_gpu_shader5/execution/ubo_array_indexing/vs-nonuniform-control-flow.shader_test b/tests/spec/arb_gpu_shader5/execution/ubo_array_indexing/vs-nonuniform-control-flow.shader_test
index af0a894..a9d126b 100644
--- a/tests/spec/arb_gpu_shader5/execution/ubo_array_indexing/vs-nonuniform-control-flow.shader_test
+++ b/tests/spec/arb_gpu_shader5/execution/ubo_array_indexing/vs-nonuniform-control-flow.shader_test
@@ -126,35 +126,35 @@ draw arrays GL_POINTS 0 48
 # the implementation doesn't take this possibility into account.
 # Probe a bunch of pixels for good measure.
 #
-relative probe rgba (0.1, 0.0) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.3, 0.0) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.5, 0.0) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.7, 0.0) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.1) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.2, 0.1) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.4, 0.1) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.6, 0.1) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.1, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.2, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.3, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.4, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.5, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.6, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.7, 0.2) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.1, 0.3) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.3, 0.3) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.5, 0.3) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.7, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.4) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.2, 0.4) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.4, 0.4) (0.4, 0.6, 0.8, 0.2)
-relative probe rgba (0.6, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.0, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.1, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.1, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.1, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.1, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.2, 0.1) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.2, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.2, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.2, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.3, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.3, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.3, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.3, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.4, 0.1) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.4, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.4, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.4, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.5, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.5, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.5, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.5, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.6, 0.1) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.6, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.6, 0.4) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.6, 0.5) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.7, 0.0) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.7, 0.2) (0.4, 0.6, 0.8, 0.2)
+relative probe rgba (0.7, 0.3) (0.4, 0.6, 0.8, 0.2)
 relative probe rgba (0.7, 0.5) (0.4, 0.6, 0.8, 0.2)
-- 
2.4.3