From 481d8ec2914ae0b1a53657c165a63a9fe24d5f27 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 14 Apr 2016 16:48:39 +1000 Subject: [PATCH] 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 --- src/compiler/glsl/ir_optimization.h | 2 +- src/compiler/glsl/linker.cpp | 2 +- .../glsl/lower_const_arrays_to_uniforms.cpp | 21 +++++++++++++++---- 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(); } -- 2.30.2