diff options
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 2407bac86cc..a2e0001e1a3 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -68,7 +68,7 @@ brw_nir_setup_glsl_builtin_uniform(nir_variable *var, static void brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var, - struct gl_shader_program *shader_prog, + const struct gl_program *prog, struct brw_stage_prog_data *stage_prog_data, bool is_scalar) { @@ -81,9 +81,9 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var, * with our name, or the prefix of a component that starts with our name. */ unsigned uniform_index = var->data.driver_location / 4; - for (unsigned u = 0; u < shader_prog->data->NumUniformStorage; u++) { + for (unsigned u = 0; u < prog->sh.data->NumUniformStorage; u++) { struct gl_uniform_storage *storage = - &shader_prog->data->UniformStorage[u]; + &prog->sh.data->UniformStorage[u]; if (storage->builtin) continue; @@ -131,9 +131,7 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var, } void -brw_nir_setup_glsl_uniforms(nir_shader *shader, - struct gl_shader_program *shader_prog, - const struct gl_program *prog, +brw_nir_setup_glsl_uniforms(nir_shader *shader, const struct gl_program *prog, struct brw_stage_prog_data *stage_prog_data, bool is_scalar) { @@ -147,8 +145,8 @@ brw_nir_setup_glsl_uniforms(nir_shader *shader, brw_nir_setup_glsl_builtin_uniform(var, prog, stage_prog_data, is_scalar); } else { - brw_nir_setup_glsl_uniform(shader->stage, var, shader_prog, - stage_prog_data, is_scalar); + brw_nir_setup_glsl_uniform(shader->stage, var, prog, stage_prog_data, + is_scalar); } } } |