From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Wed, 23 Aug 2017 16:13:30 +0000 (+0200)
Subject: pp: always use two-dimensional constant references
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=33661190d2eead1fa5a462913fdd012830cceae3;p=mesa.git

pp: always use two-dimensional constant references

Acked-by: Roland Scheidegger <sroland@vmware.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.h b/src/gallium/auxiliary/postprocess/pp_mlaa.h
index 0b2c363e1c4..85c14a786a3 100644
--- a/src/gallium/auxiliary/postprocess/pp_mlaa.h
+++ b/src/gallium/auxiliary/postprocess/pp_mlaa.h
@@ -164,12 +164,12 @@ static const char offsetvs[] = "VERT\n"
    "DCL OUT[1], GENERIC[0]\n"
    "DCL OUT[2], GENERIC[10]\n"
    "DCL OUT[3], GENERIC[11]\n"
-   "DCL CONST[0]\n"
+   "DCL CONST[0][0]\n"
    "IMM FLT32 {    1.0000,     0.0000,    -1.0000,     0.0000}\n"
    "  0: MOV OUT[0], IN[0]\n"
    "  1: MOV OUT[1], IN[1]\n"
-   "  2: MAD OUT[2], CONST[0].xyxy, IMM[0].zyyz, IN[1].xyxy\n"
-   "  3: MAD OUT[3], CONST[0].xyxy, IMM[0].xyyx, IN[1].xyxy\n"
+   "  2: MAD OUT[2], CONST[0][0].xyxy, IMM[0].zyyz, IN[1].xyxy\n"
+   "  3: MAD OUT[3], CONST[0][0].xyxy, IMM[0].xyyx, IN[1].xyxy\n"
    "  4: END\n";
 
 
@@ -183,7 +183,7 @@ static const char blend2fs_1[] = "FRAG\n"
    "DCL SVIEW[1], 2D, FLOAT\n"
    "DCL SAMP[2]\n"
    "DCL SVIEW[2], 2D, FLOAT\n"
-   "DCL CONST[0]\n"
+   "DCL CONST[0][0]\n"
    "DCL TEMP[0..6]\n"
    "IMM FLT32 {    0.0000,    -0.2500,     0.00609756,     0.5000}\n"
    "IMM FLT32 {   -1.5000,    -2.0000,     0.9000,     1.5000}\n"
@@ -204,7 +204,7 @@ static const char blend2fs_2[] =
    " 11:       BRK\n"
    " 12:     ENDIF\n"
    " 13:     MOV TEMP[4].y, IMM[0].xxxx\n"
-   " 14:     MAD TEMP[3].xyz, CONST[0].xyyy, TEMP[4].xyyy, TEMP[1].xyyy\n"
+   " 14:     MAD TEMP[3].xyz, CONST[0][0].xyyy, TEMP[4].xyyy, TEMP[1].xyyy\n"
    " 15:     MOV TEMP[3].w, IMM[0].xxxx\n"
    " 16:     TXL TEMP[5], TEMP[3], SAMP[2], 2D\n"
    " 17:     MOV TEMP[3].x, TEMP[5].yyyy\n"
@@ -229,7 +229,7 @@ static const char blend2fs_2[] =
    " 36:       BRK\n"
    " 37:     ENDIF\n"
    " 38:     MOV TEMP[5].y, IMM[0].xxxx\n"
-   " 39:     MAD TEMP[4].xyz, CONST[0].xyyy, TEMP[5].xyyy, TEMP[3].xyyy\n"
+   " 39:     MAD TEMP[4].xyz, CONST[0][0].xyyy, TEMP[5].xyyy, TEMP[3].xyyy\n"
    " 40:     MOV TEMP[4].w, IMM[0].xxxx\n"
    " 41:     TXL TEMP[6].xy, TEMP[4], SAMP[2], 2D\n"
    " 42:     MOV TEMP[4].x, TEMP[6].yyyy\n"
@@ -250,7 +250,7 @@ static const char blend2fs_2[] =
    " 57:   MOV TEMP[5].x, TEMP[1].xxxx\n"
    " 58:   ADD TEMP[1].x, TEMP[4].xxxx, IMM[2].yyyy\n"
    " 59:   MOV TEMP[5].z, TEMP[1].xxxx\n"
-   " 60:   MAD TEMP[1], TEMP[5], CONST[0].xyxy, IN[0].xyxy\n"
+   " 60:   MAD TEMP[1], TEMP[5], CONST[0][0].xyxy, IN[0].xyxy\n"
    " 61:   MOV TEMP[4], TEMP[1].xyyy\n"
    " 62:   MOV TEMP[4].w, IMM[0].xxxx\n"
    " 63:   TXL TEMP[5].x, TEMP[4], SAMP[2], 2D\n"
@@ -278,7 +278,7 @@ static const char blend2fs_2[] =
    " 85:       BRK\n"
    " 86:     ENDIF\n"
    " 87:     MOV TEMP[3].y, IMM[0].xxxx\n"
-   " 88:     MAD TEMP[5].xyz, CONST[0].xyyy, TEMP[3].yxxx, TEMP[1].xyyy\n"
+   " 88:     MAD TEMP[5].xyz, CONST[0][0].xyyy, TEMP[3].yxxx, TEMP[1].xyyy\n"
    " 89:     MOV TEMP[5].w, IMM[0].xxxx\n"
    " 90:     TXL TEMP[4], TEMP[5], SAMP[2], 2D\n"
    " 91:     MOV TEMP[2].x, TEMP[4].xxxx\n"
@@ -303,7 +303,7 @@ static const char blend2fs_2[] =
    "110:       BRK\n"
    "111:     ENDIF\n"
    "112:     MOV TEMP[4].y, IMM[0].xxxx\n"
-   "113:     MAD TEMP[5].xyz, CONST[0].xyyy, TEMP[4].yxxx, TEMP[2].xyyy\n"
+   "113:     MAD TEMP[5].xyz, CONST[0][0].xyyy, TEMP[4].yxxx, TEMP[2].xyyy\n"
    "114:     MOV TEMP[5].w, IMM[0].xxxx\n"
    "115:     TXL TEMP[6], TEMP[5], SAMP[2], 2D\n"
    "116:     MOV TEMP[3].x, TEMP[6].xxxx\n"
@@ -324,7 +324,7 @@ static const char blend2fs_2[] =
    "131:   MOV TEMP[4].y, TEMP[1].xxxx\n"
    "132:   ADD TEMP[1].x, TEMP[3].xxxx, IMM[2].yyyy\n"
    "133:   MOV TEMP[4].w, TEMP[1].xxxx\n"
-   "134:   MAD TEMP[1], TEMP[4], CONST[0].xyxy, IN[0].xyxy\n"
+   "134:   MAD TEMP[1], TEMP[4], CONST[0][0].xyxy, IN[0].xyxy\n"
    "135:   MOV TEMP[3], TEMP[1].xyyy\n"
    "136:   MOV TEMP[3].w, IMM[0].xxxx\n"
    "137:   TXL TEMP[4].y, TEMP[3], SAMP[2], 2D\n"