From 47fcef9a209e533103a7ecf4d69440a67aa463ed Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 25 Mar 2016 13:47:15 -0400 Subject: nir: move callsite of lower_outputs_to_temporaries Going to convert this pass to parameterized lower_io_to_temporaries, and we want the user to be able to specify whether to lower outputs or inputs or both. The restriction of running this pass before validate to avoid output reads no longer applies. Signed-off-by: Rob Clark Reviewed-by: Jason Ekstrand --- src/compiler/nir/glsl_to_nir.cpp | 2 -- src/compiler/nir/nir_lower_outputs_to_temporaries.c | 4 ---- 2 files changed, 6 deletions(-) (limited to 'src/compiler/nir') diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index e3fa623ba04..a86b966a26b 100644 --- a/src/compiler/nir/glsl_to_nir.cpp +++ b/src/compiler/nir/glsl_to_nir.cpp @@ -143,8 +143,6 @@ glsl_to_nir(const struct gl_shader_program *shader_prog, v2.run(sh->ir); visit_exec_list(sh->ir, &v1); - nir_lower_outputs_to_temporaries(shader, nir_shader_get_entrypoint(shader)); - shader->info.name = ralloc_asprintf(shader, "GLSL%d", shader_prog->Name); if (shader_prog->Label) shader->info.label = ralloc_strdup(shader, shader_prog->Label); diff --git a/src/compiler/nir/nir_lower_outputs_to_temporaries.c b/src/compiler/nir/nir_lower_outputs_to_temporaries.c index 21bc15b70b8..0dfb7b0e718 100644 --- a/src/compiler/nir/nir_lower_outputs_to_temporaries.c +++ b/src/compiler/nir/nir_lower_outputs_to_temporaries.c @@ -25,10 +25,6 @@ * Implements a pass that lowers output variables to a temporary plus an * output variable with a single copy at each exit point of the shader. * This way the output variable is only ever written. - * - * Because valid NIR requires that output variables are never read, this - * pass is more of a helper for NIR producers and must be run before the - * shader is ever validated. */ #include "nir.h" -- cgit v1.2.3