OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Rename class variable_entry to ir_variable_refcount_entry.

Browse Source 
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 <kenneth@whitecape.org>
Reviewed-and-tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke
2012-01-28 16:58:37 -08:00
parent bed20f02a7
commit e3b5200496
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/glsl/ir_variable_refcount.h
View File

@@ -33,10 +33,10 @@
#include "ir_visitor.h"
#include "glsl_types.h"
class variable_entry : public exec_node
class ir_variable_refcount_entry : public exec_node
{
public:
variable_entry(ir_variable *var);
ir_variable_refcount_entry(ir_variable *var);
ir_variable *var; /* The key: the variable's pointer. */
ir_assignment *assign; /* An assignment to the variable, if any */
@@ -69,9 +69,9 @@ public:
virtual ir_visitor_status visit_enter(ir_function_signature *);
virtual ir_visitor_status visit_leave(ir_assignment *);
variable_entry *get_variable_entry(ir_variable *var);
ir_variable_refcount_entry *get_variable_entry(ir_variable *var);
/* List of variable_entry */
/* List of ir_variable_refcount_entry */
exec_list variable_list;
void *mem_ctx;