From 805d31e272f1388741b9d35aa950be096e46fc54 Mon Sep 17 00:00:00 2001
From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Wed, 23 Aug 2017 18:13:40 +0200
Subject: gallium/tests: always use two-dimensional constant references

---
 src/gallium/auxiliary/util/u_tests.c                 | 4 ++--
 src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh | 8 ++++----
 src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh   | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_tests.c b/src/gallium/auxiliary/util/u_tests.c
index 7ec8eef65f..60e77b2e3b 100644
--- a/src/gallium/auxiliary/util/u_tests.c
+++ b/src/gallium/auxiliary/util/u_tests.c
@@ -418,10 +418,10 @@ util_test_constant_buffer(struct pipe_context *ctx,
    {
       static const char *text = /* I don't like ureg... */
             "FRAG\n"
-            "DCL CONST[0]\n"
+            "DCL CONST[0][0]\n"
             "DCL OUT[0], COLOR\n"
 
-            "MOV OUT[0], CONST[0]\n"
+            "MOV OUT[0], CONST[0][0]\n"
             "END\n";
       struct tgsi_token tokens[1000];
       struct pipe_shader_state state;
diff --git a/src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh b/src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh
index 85fb9ea4e7..097774336f 100644
--- a/src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh
+++ b/src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh
@@ -2,12 +2,12 @@ FRAG
 
 DCL IN[0], COLOR, LINEAR
 DCL OUT[0], COLOR
-DCL CONST[1]
-DCL CONST[3]
+DCL CONST[0][1]
+DCL CONST[0][3]
 DCL TEMP[0..1]
 
-ADD TEMP[0], IN[0], CONST[1]
-RCP TEMP[1], CONST[3].xxxx
+ADD TEMP[0], IN[0], CONST[0][1]
+RCP TEMP[1], CONST[0][3].xxxx
 MUL OUT[0], TEMP[0], TEMP[1]
 
 END
diff --git a/src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh b/src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh
index e227917fd3..0b05ca8b67 100644
--- a/src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh
+++ b/src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh
@@ -4,13 +4,13 @@ DCL IN[0]
 DCL IN[1]
 DCL OUT[0], POSITION
 DCL OUT[1], COLOR
-DCL CONST[1]
-DCL CONST[3]
+DCL CONST[0][1]
+DCL CONST[0][3]
 DCL TEMP[0..1]
 
 MOV OUT[0], IN[0]
-ADD TEMP[0], IN[1], CONST[1]
-RCP TEMP[1], CONST[3].xxxx
+ADD TEMP[0], IN[1], CONST[0][1]
+RCP TEMP[1], CONST[0][3].xxxx
 MUL OUT[1], TEMP[0], TEMP[1]
 
 END
-- 
cgit v1.2.3