summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2018-03-20 12:28:35 -0700
committerJason Ekstrand <[email protected]>2018-06-22 20:15:57 -0700
commite5130012e4b3b276ec80e11e9d79a69a3c3a5a4c (patch)
treed0238ce7465eef5cc67f69804d0b96c3bf78dc95
parent152057b138d58370f6b90406b07b2604439fabb7 (diff)
st/nir: Move lower_deref_instrs later
Reviewed-by: Caio Marcelo de Oliveira Filho <[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]>
-rw-r--r--src/mesa/state_tracker/st_glsl_to_nir.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 6d5881084d3..fa1fbbf3a3d 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -376,7 +376,6 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
return prog->nir;
nir_shader *nir = glsl_to_nir(shader_program, stage, options);
- nir_lower_deref_instrs(nir, (nir_lower_deref_flags)~0);
/* Set the next shader stage hint for VS and TES. */
if (!nir->info.separate_shader &&
@@ -590,6 +589,8 @@ st_nir_get_mesa_program(struct gl_context *ctx,
nir_shader *nir = st_glsl_to_nir(st, prog, shader_program, shader->Stage);
+ nir_lower_deref_instrs(nir, (nir_lower_deref_flags)~0);
+
set_st_program(prog, shader_program, nir);
prog->nir = nir;
}