summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-08-14 15:35:57 +0100
committerJosé Fonseca <jfonseca@vmware.com>2010-08-14 15:35:57 +0100
commit1cbcf6693aa490c4dcb56712bfb9998deb270f08 (patch)
tree6d8257d3510737c099db74978102456f90201a59 /src/glsl
parent1d22923fae7f4c749b3820844110e3d8ee4d26c0 (diff)
glsl: Standardize a few more uses of struct vs class keyword.
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/glsl_symbol_table.h2
-rw-r--r--src/glsl/glsl_types.h13
-rw-r--r--src/glsl/ir.h4
-rw-r--r--src/glsl/ir_structure_splitting.cpp4
-rw-r--r--src/glsl/ir_tree_grafting.cpp2
5 files changed, 13 insertions, 12 deletions
diff --git a/src/glsl/glsl_symbol_table.h b/src/glsl/glsl_symbol_table.h
index 02e4542cf3..4cb7559e9a 100644
--- a/src/glsl/glsl_symbol_table.h
+++ b/src/glsl/glsl_symbol_table.h
@@ -40,7 +40,7 @@ extern "C" {
* Wraps the existing \c _mesa_symbol_table data structure to enforce some
* type safe and some symbol table invariants.
*/
-class glsl_symbol_table {
+struct glsl_symbol_table {
private:
enum glsl_symbol_name_space {
glsl_variable_name_space = 0,
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index 97d0d98c62..80cec635d9 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -35,6 +35,7 @@ extern "C" {
}
struct _mesa_glsl_parse_state;
+struct glsl_symbol_table;
extern "C" void
_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state);
@@ -209,7 +210,7 @@ struct glsl_type {
/**
* Generate the constructor for this type and add it to the symbol table
*/
- class ir_function *generate_constructor(class glsl_symbol_table *) const;
+ class ir_function *generate_constructor(glsl_symbol_table *) const;
/**
* Query the total number of scalars that make up a scalar, vector or matrix
@@ -449,12 +450,12 @@ private:
* the world in a public header file.
*/
/*@{*/
- static void generate_110_types(class glsl_symbol_table *);
- static void generate_120_types(class glsl_symbol_table *);
- static void generate_130_types(class glsl_symbol_table *);
- static void generate_ARB_texture_rectangle_types(class glsl_symbol_table *,
+ static void generate_110_types(glsl_symbol_table *);
+ static void generate_120_types(glsl_symbol_table *);
+ static void generate_130_types(glsl_symbol_table *);
+ static void generate_ARB_texture_rectangle_types(glsl_symbol_table *,
bool);
- static void generate_EXT_texture_array_types(class glsl_symbol_table *,
+ static void generate_EXT_texture_array_types(glsl_symbol_table *,
bool);
/*@}*/
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index eb9e6cdf0e..b04222893c 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -1383,11 +1383,11 @@ _mesa_glsl_release_functions(void);
extern void
reparent_ir(exec_list *list, void *mem_ctx);
-class glsl_symbol_table;
+struct glsl_symbol_table;
extern void
import_prototypes(const exec_list *source, exec_list *dest,
- class glsl_symbol_table *symbols, void *mem_ctx);
+ struct glsl_symbol_table *symbols, void *mem_ctx);
extern bool
ir_has_call(ir_instruction *ir);
diff --git a/src/glsl/ir_structure_splitting.cpp b/src/glsl/ir_structure_splitting.cpp
index e257defb1a..c0244071ee 100644
--- a/src/glsl/ir_structure_splitting.cpp
+++ b/src/glsl/ir_structure_splitting.cpp
@@ -181,13 +181,13 @@ public:
void split_deref(ir_dereference **deref);
void handle_rvalue(ir_rvalue **rvalue);
- struct variable_entry *get_splitting_entry(ir_variable *var);
+ variable_entry *get_splitting_entry(ir_variable *var);
exec_list *variable_list;
void *mem_ctx;
};
-struct variable_entry *
+variable_entry *
ir_structure_splitting_visitor::get_splitting_entry(ir_variable *var)
{
assert(var);
diff --git a/src/glsl/ir_tree_grafting.cpp b/src/glsl/ir_tree_grafting.cpp
index e80db31cb3..6acc5b86c5 100644
--- a/src/glsl/ir_tree_grafting.cpp
+++ b/src/glsl/ir_tree_grafting.cpp
@@ -324,7 +324,7 @@ tree_grafting_basic_block(ir_instruction *bb_first,
lhs_var->mode == ir_var_inout)
continue;
- struct variable_entry *entry = info->refs->get_variable_entry(lhs_var);
+ variable_entry *entry = info->refs->get_variable_entry(lhs_var);
if (!entry->declaration ||
entry->assigned_count != 1 ||