fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-13 20:18:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir: don't create invalid inputs in nir_create_passthrough_gs

Browse source 
The helper was creating input locations for some builtin bariables.

This caused validation errors in zink because those builtins can't be
used as input.

Fixes: d0342e28b3 ("nir: Add helper to create passthrough GS shader")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22871>
(cherry picked from commit 83692bfe30)
This commit is contained in:
antonino 2023-05-05 11:53:55 +02:00 • committed by Eric Engestrom
parent 41ba7bb42e
commit 287e69f76e
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3010,7 +3010,7 @@
"description": "nir: don't create invalid inputs in `nir_create_passthrough_gs`",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d0342e28b32d7aa4b25cf045ac9933348ec053a9"
},

5
src/compiler/nir/nir_passthrough_gs.c
View file

@ -188,6 +188,11 @@ nir_create_passthrough_gs(const nir_shader_compiler_options *options,
nir_foreach_shader_out_variable(var, prev_stage) {
assert(!var->data.patch);
/* input vars can't be created for those */
if (var->data.location == VARYING_SLOT_LAYER ||
var->data.location == VARYING_SLOT_VIEW_INDEX)
continue;
char name[100];
if (var->name)
snprintf(name, sizeof(name), "in_%s", var->name);