fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: fix separate shader patch variable location adjustment

Browse source 
in spirv, these start at location 0, not location 32

fixes #10414

Fixes: d9942442f2 ("zink: handle patch variable locations for separate shaders better")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26981>
(cherry picked from commit 565ee4fafc)
This commit is contained in:
Mike Blumenkrantz 2024-01-10 12:22:56 -05:00 • committed by Eric Engestrom
parent 62161b7425
commit 151cd31e05
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -564,7 +564,7 @@
"description": "zink: fix separate shader patch variable location adjustment",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d9942442f200bea0ef5b906f288a5234994767b5",
"notes": null

4
src/gallium/drivers/zink/zink_compiler.c
View file

@ -4912,7 +4912,7 @@ fixup_io_locations(nir_shader *nir)
if (var->data.location == VARYING_SLOT_VAR0)
var->data.driver_location = 0;
else if (var->data.patch)
var->data.driver_location = var->data.location - VARYING_SLOT_VAR0;
var->data.driver_location = var->data.location - VARYING_SLOT_PATCH0;
else
var->data.driver_location = var->data.location;
}
@ -4939,7 +4939,7 @@ fixup_io_locations(nir_shader *nir)
size += glsl_count_vec4_slots(var->type, false, false);
}
if (var->data.patch)
var->data.driver_location = var->data.location - VARYING_SLOT_VAR0;
var->data.driver_location = var->data.location - VARYING_SLOT_PATCH0;
else
var->data.driver_location = slot;
found = true;