diff options
| author | Kenneth Graunke <[email protected]> | 2012-01-28 16:58:37 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-01-30 17:44:52 -0800 |
| commit | e3b520049675f78065eccbc25c001ea77861c129 (patch) | |
| tree | bef7b2bf8bb25cbb2e271685e3434fc64227a940 /src/glsl/opt_dead_code.cpp | |
| parent | bed20f02a771f43e1c5092254705701c228cfa7f (diff) | |
glsl: Rename class variable_entry to ir_variable_refcount_entry.
Exporting a publicly visible class with a generic name like
"variable_entry" via ir_variable_refcount.h is kind of mean.
Many IR transformers would like to define their own "variable_entry"
class. If they accidentally include this header, the compiler/linker
may get confused and try to instantiate the wrong variable_entry class,
leading to bizarre runtime crashes.
The hope is that renaming this one will allow .cpp files to safely
declare and use their own file-scope "variable_entry" classes.
This avoids crashes caused by converting src/glsl to automake.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-and-tested-by: Matt Turner <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/glsl/opt_dead_code.cpp')
| -rw-r--r-- | src/glsl/opt_dead_code.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/opt_dead_code.cpp b/src/glsl/opt_dead_code.cpp index 5b9546ad409..22c7af1c20a 100644 --- a/src/glsl/opt_dead_code.cpp +++ b/src/glsl/opt_dead_code.cpp @@ -50,7 +50,7 @@ do_dead_code(exec_list *instructions, bool uniform_locations_assigned) v.run(instructions); foreach_iter(exec_list_iterator, iter, v.variable_list) { - variable_entry *entry = (variable_entry *)iter.get(); + ir_variable_refcount_entry *entry = (ir_variable_refcount_entry *)iter.get(); /* Since each assignment is a reference, the refereneced count must be * greater than or equal to the assignment count. If they are equal, |