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@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7917>
(cherry picked from commit 22180137e9709937116f622185d027a108410236)
diff --git a/.pick_status.json b/.pick_status.json
index 2c71ab1..cd6a92b 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 87b49c9..fbb0541 100644
--- a/src/freedreno/ir3/ir3_nir_lower_tess.c
+++ b/src/freedreno/ir3/ir3_nir_lower_tess.c
@@ -29,7 +29,7 @@
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 36aba4f..59c68d5 100644
--- a/src/freedreno/ir3/ir3_shader.h
+++ b/src/freedreno/ir3/ir3_shader.h
@@ -581,7 +581,7 @@
* 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.
