summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-04-14 16:48:39 +1000
committerTimothy Arceri <[email protected]>2016-09-27 11:11:15 +1000
commit481d8ec2914ae0b1a53657c165a63a9fe24d5f27 (patch)
treecdc83db6407a800a2ab6cd17d5f1d47fb1d3fd96 /src/compiler
parent017081a3e50d2907045fdd0a4811bb83a025ba07 (diff)
glsl: use reproducible name for lowered const arrays
Otherwise we can end up with mismatching names between the cached binary and the cached metadata. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/ir_optimization.h2
-rw-r--r--src/compiler/glsl/linker.cpp2
-rw-r--r--src/compiler/glsl/lower_const_arrays_to_uniforms.cpp21
3 files changed, 19 insertions, 6 deletions
diff --git a/src/compiler/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h
index 3bd6928a06c..6f2bc321fa7 100644
--- a/src/compiler/glsl/ir_optimization.h
+++ b/src/compiler/glsl/ir_optimization.h
@@ -126,7 +126,7 @@ bool lower_variable_index_to_cond_assign(gl_shader_stage stage,
exec_list *instructions, bool lower_input, bool lower_output,
bool lower_temp, bool lower_uniform);
bool lower_quadop_vector(exec_list *instructions, bool dont_lower_swz);
-bool lower_const_arrays_to_uniforms(exec_list *instructions);
+bool lower_const_arrays_to_uniforms(exec_list *instructions, unsigned stage);
bool lower_clip_cull_distance(struct gl_shader_program *prog,
gl_linked_shader *shader);
void lower_output_reads(unsigned stage, exec_list *instructions);
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 929a653e137..8c28d249d89 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -4899,7 +4899,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
ctx->Const.NativeIntegers))
;
- lower_const_arrays_to_uniforms(prog->_LinkedShaders[i]->ir);
+ lower_const_arrays_to_uniforms(prog->_LinkedShaders[i]->ir, i);
propagate_invariance(prog->_LinkedShaders[i]->ir);
}
diff --git a/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp
index 665a9ad1d48..73b9b542448 100644
--- a/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp
+++ b/src/compiler/glsl/lower_const_arrays_to_uniforms.cpp
@@ -45,9 +45,11 @@
namespace {
class lower_const_array_visitor : public ir_rvalue_visitor {
public:
- lower_const_array_visitor(exec_list *insts)
+ lower_const_array_visitor(exec_list *insts, unsigned s)
{
instructions = insts;
+ stage = s;
+ const_count = 0;
progress = false;
}
@@ -62,6 +64,8 @@ public:
private:
exec_list *instructions;
+ unsigned stage;
+ unsigned const_count;
bool progress;
};
@@ -83,7 +87,16 @@ lower_const_array_visitor::handle_rvalue(ir_rvalue **rvalue)
void *mem_ctx = ralloc_parent(con);
- char *uniform_name = ralloc_asprintf(mem_ctx, "constarray__%p", con);
+ /* In the very unlikely event of 4294967295 constant arrays in a single
+ * shader, don't promote this to a uniform.
+ */
+ unsigned limit = ~0;
+ if (const_count == limit)
+ return;
+
+ char *uniform_name = ralloc_asprintf(mem_ctx, "constarray_%x_%u",
+ const_count, stage);
+ const_count++;
ir_variable *uni =
new(mem_ctx) ir_variable(con->type, uniform_name, ir_var_uniform);
@@ -104,8 +117,8 @@ lower_const_array_visitor::handle_rvalue(ir_rvalue **rvalue)
} /* anonymous namespace */
bool
-lower_const_arrays_to_uniforms(exec_list *instructions)
+lower_const_arrays_to_uniforms(exec_list *instructions, unsigned stage)
{
- lower_const_array_visitor v(instructions);
+ lower_const_array_visitor v(instructions, stage);
return v.run();
}