diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-09-08 14:31:11 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-09-09 12:29:38 -0700 |
| commit | b828f7a27b2b8d6b90e646c08dfa25e1d737a9bb (patch) | |
| tree | 04ef8161a71729b952b8e72d4d35bc33b5c6685d | |
| parent | 1dbe4af9c9e318525fc082b542b93fb7f1e5efba (diff) | |
nir/glsl: Use lower_outputs_to_temporaries instead of relying on GLSL IR
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | src/glsl/nir/glsl_to_nir.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp index 0712908eee..ad7d7dddea 100644 --- a/src/glsl/nir/glsl_to_nir.cpp +++ b/src/glsl/nir/glsl_to_nir.cpp @@ -138,6 +138,8 @@ glsl_to_nir(struct gl_shader *sh, const nir_shader_compiler_options *options) v2.run(sh->ir); visit_exec_list(sh->ir, &v1); + nir_lower_outputs_to_temporaries(shader); + return shader; } diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 445764d3d0..de1a7fe81a 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -322,9 +322,6 @@ process_glsl_ir(gl_shader_stage stage, options, ctx->Const.NativeIntegers) || progress; } while (progress); - if (options->NirOptions != NULL) - lower_output_reads(stage, shader->ir); - validate_ir_tree(shader->ir); /* Now that we've finished altering the linked IR, reparent any live IR back |