Mesa (staging/20.3): ir3: Allow tesselation to use all 32 varying slots

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: e2789cd78eb84d59698187f8d1770720ef9a993b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2789cd78eb84d59698187f8d1770720ef9a993b

Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Thu Dec 10 19:18:18 2020 +0200

ir3: Allow tesselation to use all 32 varying slots

POS, PSIZE, CLIP_DIST0, and CLIP_DIST1 have their own predefined
indices, map's size should take this into account.

Fixes: 9e063b01 "ir3: Switch tess lowering to use location"

Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7917>
(cherry picked from commit 22180137e9709937116f622185d027a108410236)

---

 .pick_status.json                      | 2 +-
 src/freedreno/ir3/ir3_nir_lower_tess.c | 2 +-
 src/freedreno/ir3/ir3_shader.h         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2c71ab14a72..cd6a92b0e32 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
         "description": "ir3: Allow tesselation to use all 32 varying slots",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "9e063b01b77059d13756794f95fa0eb0e5ef6633"
     },
diff --git a/src/freedreno/ir3/ir3_nir_lower_tess.c b/src/freedreno/ir3/ir3_nir_lower_tess.c
index 87b49c901a2..fbb0541b5d9 100644
--- a/src/freedreno/ir3/ir3_nir_lower_tess.c
+++ b/src/freedreno/ir3/ir3_nir_lower_tess.c
@@ -29,7 +29,7 @@ struct state {
 	uint32_t topology;
 
 	struct primitive_map {
-		unsigned loc[32];
+		unsigned loc[32 + 4]; /* +POSITION +PSIZE +CLIP_DIST0 +CLIP_DIST1 */
 		unsigned stride;
 	} map;
 
diff --git a/src/freedreno/ir3/ir3_shader.h b/src/freedreno/ir3/ir3_shader.h
index 36aba4facc7..59c68d53491 100644
--- a/src/freedreno/ir3/ir3_shader.h
+++ b/src/freedreno/ir3/ir3_shader.h
@@ -581,7 +581,7 @@ struct ir3_shader_variant {
 	 * HS, where varyings are read in the next stage via ldg with a dword
 	 * offset, and in bytes for all other stages.
 	 */
-	unsigned output_loc[32];
+	unsigned output_loc[32 + 4]; /* +POSITION +PSIZE +CLIP_DIST0 +CLIP_DIST1 */
 
 	/* attributes (VS) / varyings (FS):
 	 * Note that sysval's should come *after* normal inputs.