KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: Fix setup of pstipple frag coord var. 

If the last input was a struct or matrix, we would have overlapped driver
locations for our new position var.

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4670>
This commit is contained in:
Eric Anholt 2020-04-21 16:18:42 -07:00 committed by Marge Bot
parent 035fd4fb9f
commit e82ce1852a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/auxiliary/nir/nir_draw_helpers.c
View File

@ -49,20 +49,16 @@ typedef struct {
static nir_ssa_def *
load_frag_coord(nir_builder *b)
{
int max_driver_loc = -1;
nir_foreach_variable(var, &b->shader->inputs) {
if (var->data.location == VARYING_SLOT_POS)
return nir_load_var(b, var);
if (max_driver_loc < (int)var->data.driver_location)
max_driver_loc = var->data.driver_location;
}
nir_variable *pos = nir_variable_create(b->shader, nir_var_shader_in,
glsl_vec4_type(), NULL);
pos->data.location = VARYING_SLOT_POS;
pos->data.interpolation = INTERP_MODE_NOPERSPECTIVE;
pos->data.driver_location = max_driver_loc + 1;
b->shader->num_inputs++;
pos->data.driver_location = b->shader->num_inputs++;
return nir_load_var(b, pos);
}