Mesa (master): Revert "i965: use nir_lower_indirect_derefs() for GLSL"
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Mon Dec 5 23:21:45 UTC 2016
Module: Mesa
Branch: master
Commit: 0291bf4db2affbfb6a7daeb562c0cf56f6a85829
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0291bf4db2affbfb6a7daeb562c0cf56f6a85829
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Mon Dec 5 15:20:52 2016 -0800
Revert "i965: use nir_lower_indirect_derefs() for GLSL"
This reverts commit 9404439a754e5640ccd98df40fa694835c0d8759. I didn't
intend to push it and it breaks clip and cull distance.
---
src/intel/vulkan/anv_pipeline.c | 10 ++++++++++
src/mesa/drivers/dri/i965/brw_link.cpp | 13 +++++++++++++
src/mesa/drivers/dri/i965/brw_nir.c | 10 ----------
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 6b0a3c9..9b65e35 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -177,6 +177,16 @@ anv_shader_compile_to_nir(struct anv_device *device,
nir_shader_gather_info(nir, entry_point->impl);
+ nir_variable_mode indirect_mask = 0;
+ if (compiler->glsl_compiler_options[stage].EmitNoIndirectInput)
+ indirect_mask |= nir_var_shader_in;
+ if (compiler->glsl_compiler_options[stage].EmitNoIndirectOutput)
+ indirect_mask |= nir_var_shader_out;
+ if (compiler->glsl_compiler_options[stage].EmitNoIndirectTemp)
+ indirect_mask |= nir_var_local;
+
+ nir_lower_indirect_derefs(nir, indirect_mask);
+
return nir;
}
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index 19e691e..3f6041b 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -137,6 +137,19 @@ process_glsl_ir(struct brw_context *brw,
do_copy_propagation(shader->ir);
+ bool lowered_variable_indexing =
+ lower_variable_index_to_cond_assign(shader->Stage, shader->ir,
+ options->EmitNoIndirectInput,
+ options->EmitNoIndirectOutput,
+ options->EmitNoIndirectTemp,
+ options->EmitNoIndirectUniform);
+
+ if (unlikely(brw->perf_debug && lowered_variable_indexing)) {
+ perf_debug("Unsupported form of variable indexing in %s; falling "
+ "back to very inefficient code generation\n",
+ _mesa_shader_stage_to_abbrev(shader->Stage));
+ }
+
bool progress;
do {
progress = false;
diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c
index 8768cee..763e3ec 100644
--- a/src/mesa/drivers/dri/i965/brw_nir.c
+++ b/src/mesa/drivers/dri/i965/brw_nir.c
@@ -485,16 +485,6 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir)
/* Lower a bunch of stuff */
OPT_V(nir_lower_var_copies);
- nir_variable_mode indirect_mask = 0;
- if (compiler->glsl_compiler_options[nir->stage].EmitNoIndirectInput)
- indirect_mask |= nir_var_shader_in;
- if (compiler->glsl_compiler_options[nir->stage].EmitNoIndirectOutput)
- indirect_mask |= nir_var_shader_out;
- if (compiler->glsl_compiler_options[nir->stage].EmitNoIndirectTemp)
- indirect_mask |= nir_var_local;
-
- nir_lower_indirect_derefs(nir, indirect_mask);
-
/* Get rid of split copies */
nir = nir_optimize(nir, is_scalar);
More information about the mesa-commit
mailing list