diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 11 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 0203c44f1cb..c75721c06ca 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -321,13 +321,10 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) * get sent to the shader. */ nir_foreach_variable(var, &prog->nir->uniforms) { - if (strncmp(var->name, "gl_", 3) == 0) { - const nir_state_slot *const slots = var->state_slots; - assert(var->state_slots != NULL); - - for (unsigned int i = 0; i < var->num_state_slots; i++) { - _mesa_add_state_reference(prog->Parameters, slots[i].tokens); - } + const nir_state_slot *const slots = var->state_slots; + for (unsigned int i = 0; i < var->num_state_slots; i++) { + assert(slots != NULL); + _mesa_add_state_reference(prog->Parameters, slots[i].tokens); } } } diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 69da83ad364..64c745b609c 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -202,7 +202,7 @@ brw_nir_setup_glsl_uniforms(void *mem_ctx, nir_shader *shader, if (var->interface_type != NULL || var->type->contains_atomic()) continue; - if (strncmp(var->name, "gl_", 3) == 0) { + if (var->num_state_slots > 0) { brw_nir_setup_glsl_builtin_uniform(var, prog, stage_prog_data, is_scalar); } else { |