fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: use local variable in consumer shader i/o assign to match producer usage

Browse source 
no functional changes

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15770>
This commit is contained in:
Mike Blumenkrantz 2022-04-06 10:21:32 -04:00 • committed by Marge Bot
parent 91e0b919f4
commit beb7a9cec5
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1105,7 +1105,8 @@ is_texcoord(gl_shader_stage stage, const nir_variable *var)
static bool
assign_consumer_var_io(gl_shader_stage stage, nir_variable *var, unsigned *reserved, unsigned char *slot_map)
{
switch (var->data.location) {
unsigned slot = var->data.location;
switch (slot) {
case VARYING_SLOT_POS:
case VARYING_SLOT_PNTC:
case VARYING_SLOT_PSIZ:
@ -1122,21 +1123,21 @@ assign_consumer_var_io(gl_shader_stage stage, nir_variable *var, unsigned *reser
break;
default:
if (var->data.patch) {
assert(var->data.location >= VARYING_SLOT_PATCH0);
var->data.driver_location = var->data.location - VARYING_SLOT_PATCH0;
} else if (var->data.location >= VARYING_SLOT_VAR0 &&
assert(slot >= VARYING_SLOT_PATCH0);
var->data.driver_location = slot - VARYING_SLOT_PATCH0;
} else if (slot >= VARYING_SLOT_VAR0 &&
stage == MESA_SHADER_TESS_CTRL &&
var->data.mode == nir_var_shader_out)
var->data.driver_location = var->data.location - VARYING_SLOT_VAR0;
var->data.driver_location = slot - VARYING_SLOT_VAR0;
else {
if (slot_map[var->data.location] == (unsigned char)-1) {
if (slot_map[slot] == (unsigned char)-1) {
if (!is_texcoord(stage, var))
/* dead io */
return false;
/* texcoords can't be eliminated in fs due to GL_COORD_REPLACE */
slot_map[var->data.location] = (*reserved)++;
slot_map[slot] = (*reserved)++;
}
var->data.driver_location = slot_map[var->data.location];
var->data.driver_location = slot_map[slot];
}
}
return true;