summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_nir.cpp1
-rw-r--r--src/mesa/drivers/dri/i965/brw_shader.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index c179d7137a8..6bb52ebd877 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -90,7 +90,6 @@ fs_visitor::emit_nir_code()
nir_shader *nir;
/* First, lower the GLSL IR or Mesa IR to NIR */
if (shader_prog) {
- lower_output_reads(shader->base.ir);
nir = glsl_to_nir(&shader->base, options);
} else {
nir = prog_to_nir(prog, options);
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index bf9aceb9923..87000776f1d 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -199,6 +199,9 @@ process_glsl_ir(struct brw_context *brw,
options, ctx->Const.NativeIntegers) || progress;
} while (progress);
+ if (options->NirOptions != NULL)
+ lower_output_reads(shader->ir);
+
validate_ir_tree(shader->ir);
/* Now that we've finished altering the linked IR, reparent any live IR back