From 9bea01899433ca6a8047b4172ffec6e89afe7625 Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Wed, 11 May 2016 13:48:18 +0200 Subject: glsl: use var with initializer on global var validation Currently, when cross validating global variables, all global variables seen in the shaders that are part of a program are saved in a table. When checking a variable this already exist in the table, we check both are initialized to the same value. If the already saved variable does not have an initializer, we copy it from the new variable. Unfortunately this is wrong, as we are modifying something it is constant. Also, if this modified variable is used in another program, it will keep the initializer, when it should have none. Instead of copying the initializer, this commit replaces the old variable with the new one. So if we see again the same variable with an initializer, we can compare if both are the same or not. v2: convert tabs in whitespaces (Kenenth Graunke) Reviewed-by: Kenneth Graunke --- src/compiler/glsl/glsl_symbol_table.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/compiler/glsl/glsl_symbol_table.cpp') diff --git a/src/compiler/glsl/glsl_symbol_table.cpp b/src/compiler/glsl/glsl_symbol_table.cpp index 6c682acf560..6d7baad4863 100644 --- a/src/compiler/glsl/glsl_symbol_table.cpp +++ b/src/compiler/glsl/glsl_symbol_table.cpp @@ -278,3 +278,13 @@ glsl_symbol_table::disable_variable(const char *name) entry->v = NULL; } } + +void +glsl_symbol_table::replace_variable(const char *name, + ir_variable *v) +{ + symbol_table_entry *entry = get_entry(name); + if (entry != NULL) { + entry->v = v; + } +} -- cgit v1.2.3