From: Brian Paul <brianp@vmware.com>
Date: Fri, 18 Mar 2016 20:20:01 +0000 (-0600)
Subject: postprocess: declare sampler views in shaders
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e7b5a844e3b69e709c702cf012f2db5dc1f0ca50;p=mesa.git

postprocess: declare sampler views in shaders

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
---

diff --git a/src/gallium/auxiliary/postprocess/pp_colors.h b/src/gallium/auxiliary/postprocess/pp_colors.h
index a79858ef53c..76c4ab49b5c 100644
--- a/src/gallium/auxiliary/postprocess/pp_colors.h
+++ b/src/gallium/auxiliary/postprocess/pp_colors.h
@@ -33,6 +33,7 @@ static const char nored[] = "FRAG\n"
    "DCL IN[0], GENERIC[0], PERSPECTIVE\n"
    "DCL OUT[0], COLOR\n"
    "DCL SAMP[0]\n"
+   "DCL SVIEW[0], 2D, FLOAT\n"
    "DCL TEMP[0]\n"
    "IMM FLT32 {    0.0000,     0.0000,     0.0000,     0.0000}\n"
    "  0: TEX TEMP[0], IN[0].xyyy, SAMP[0], 2D\n"
@@ -46,6 +47,7 @@ static const char nogreen[] = "FRAG\n"
    "DCL IN[0], GENERIC[0], PERSPECTIVE\n"
    "DCL OUT[0], COLOR\n"
    "DCL SAMP[0]\n"
+   "DCL SVIEW[0], 2D, FLOAT\n"
    "DCL TEMP[0]\n"
    "IMM FLT32 {    0.0000,     0.0000,     0.0000,     0.0000}\n"
    "  0: TEX TEMP[0], IN[0].xyyy, SAMP[0], 2D\n"
@@ -59,6 +61,7 @@ static const char noblue[] = "FRAG\n"
    "DCL IN[0], GENERIC[0], PERSPECTIVE\n"
    "DCL OUT[0], COLOR\n"
    "DCL SAMP[0]\n"
+   "DCL SVIEW[0], 2D, FLOAT\n"
    "DCL TEMP[0]\n"
    "IMM FLT32 {    0.0000,     0.0000,     0.0000,     0.0000}\n"
    "  0: TEX TEMP[0], IN[0].xyyy, SAMP[0], 2D\n"
diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.h b/src/gallium/auxiliary/postprocess/pp_mlaa.h
index 93a8a8afa90..0b2c363e1c4 100644
--- a/src/gallium/auxiliary/postprocess/pp_mlaa.h
+++ b/src/gallium/auxiliary/postprocess/pp_mlaa.h
@@ -50,6 +50,7 @@ static const char depth1fs[] = "FRAG\n"
    "DCL IN[2], GENERIC[11], PERSPECTIVE\n"
    "DCL OUT[0], COLOR\n"
    "DCL SAMP[0]\n"
+   "DCL SVIEW[0], 2D, FLOAT\n"
    "DCL TEMP[0..2]\n"
    "IMM FLT32 {    0.0030,     0.0000,     1.0000,     0.0000}\n"
    "  0: TEX TEMP[0].x, IN[1].xyyy, SAMP[0], 2D\n"
@@ -80,6 +81,7 @@ static const char color1fs[] = "FRAG\n"
    "DCL IN[2], GENERIC[11], PERSPECTIVE\n"
    "DCL OUT[0], COLOR\n"
    "DCL SAMP[0]\n"
+   "DCL SVIEW[0], 2D, FLOAT\n"
    "DCL TEMP[0..2]\n"
    "IMM FLT32 {    0.2126,     0.7152,     0.0722,     0.1000}\n"
    "IMM FLT32 {    1.0000,     0.0000,     0.0000,     0.0000}\n"
@@ -112,6 +114,7 @@ static const char neigh3fs[] = "FRAG\n"
    "DCL IN[2], GENERIC[11], PERSPECTIVE\n"
    "DCL OUT[0], COLOR\n"
    "DCL SAMP[0]\n"
+   "DCL SVIEW[0], 2D, FLOAT\n"
    "DCL SAMP[1]\n"
    "DCL TEMP[0..8]\n"
    "IMM FLT32 {    1.0000,     0.00001,     0.0000,     0.0000}\n"
@@ -175,8 +178,11 @@ static const char blend2fs_1[] = "FRAG\n"
    "DCL IN[0], GENERIC[0], PERSPECTIVE\n"
    "DCL OUT[0], COLOR\n"
    "DCL SAMP[0]\n"
+   "DCL SVIEW[0], 2D, FLOAT\n"
    "DCL SAMP[1]\n"
+   "DCL SVIEW[1], 2D, FLOAT\n"
    "DCL SAMP[2]\n"
+   "DCL SVIEW[2], 2D, FLOAT\n"
    "DCL CONST[0]\n"
    "DCL TEMP[0..6]\n"
    "IMM FLT32 {    0.0000,    -0.2500,     0.00609756,     0.5000}\n"