diff options
| author | Rob Clark <[email protected]> | 2018-04-05 13:21:55 -0400 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2018-06-22 20:54:00 -0700 |
| commit | 245ce114c974c6fd78b4004fe830f0507c9afcbb (patch) | |
| tree | e9bf27c539e432326db0677c795636793ebf3567 /src/mesa/state_tracker | |
| parent | c409cfddcfceb3df1c1a36c9c7ae5e1fbdeca83c (diff) | |
nir: convert lower_io_arrays_to_elements to deref instructions
Signed-off-by: Rob Clark <[email protected]>
Acked-by: Rob Clark <[email protected]>
Acked-by: Bas Nieuwenhuizen <[email protected]>
Acked-by: Dave Airlie <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index e03c6dbc298..6444586ec86 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -775,8 +775,6 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog, const nir_shader_compiler_options *options = st->ctx->Const.ShaderCompilerOptions[prog->info.stage].NirOptions; - NIR_PASS_V(nir, nir_lower_deref_instrs, (nir_lower_deref_flags)~0); - NIR_PASS_V(nir, nir_split_var_copies); NIR_PASS_V(nir, nir_lower_var_copies); if (options->lower_all_io_to_temps || @@ -839,6 +837,8 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog, NIR_PASS_V(nir, st_nir_lower_uniforms_to_ubo); } + NIR_PASS_V(nir, nir_lower_deref_instrs, (nir_lower_deref_flags)~0); + if (screen->get_param(screen, PIPE_CAP_NIR_SAMPLERS_AS_DEREF)) NIR_PASS_V(nir, gl_nir_lower_samplers_as_deref, shader_program); else |