diff options
author | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-09-14 19:52:38 -0700 |
---|---|---|
committer | Jordan Justen <jordan.l.justen@intel.com> | 2017-10-20 12:49:17 -0700 |
commit | 59fb59ad54d368683d5cc3b149f021452bddc05f (patch) | |
tree | 734e742be190df8ae7a19a975c59ba7eeeded6eb /src/mesa/drivers | |
parent | 341529dbee5c2b17fdcb7990484a383459bed305 (diff) |
nir: Get rid of nir_shader::stage
It's redundant with nir_shader::info::stage.
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 6 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 1fe5ad66f54..1a28e63fcae 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -296,10 +296,12 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg) NIR_PASS_V(producer, nir_lower_indirect_derefs, indirect_mask); NIR_PASS_V(consumer, nir_lower_indirect_derefs, indirect_mask); - const bool p_is_scalar = compiler->scalar_stage[producer->stage]; + const bool p_is_scalar = + compiler->scalar_stage[producer->info.stage]; producer = brw_nir_optimize(producer, compiler, p_is_scalar); - const bool c_is_scalar = compiler->scalar_stage[producer->stage]; + const bool c_is_scalar = + compiler->scalar_stage[producer->info.stage]; consumer = brw_nir_optimize(consumer, compiler, c_is_scalar); } diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp index 62755fda206..9e135cbb1a1 100644 --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp @@ -206,8 +206,8 @@ brw_nir_setup_glsl_uniforms(void *mem_ctx, 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, prog, stage_prog_data, - is_scalar); + brw_nir_setup_glsl_uniform(shader->info.stage, var, prog, + stage_prog_data, is_scalar); } } } |