Browse Source

glsl: Standardize a few more uses of struct vs class keyword.

tags/mesa-7.9-rc1
José Fonseca 15 years ago
parent
commit
1cbcf6693a

+ 1
- 1
src/glsl/glsl_symbol_table.h View File

@@ -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,

+ 7
- 6
src/glsl/glsl_types.h View File

@@ -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);
/*@}*/


+ 2
- 2
src/glsl/ir.h View File

@@ -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);

+ 2
- 2
src/glsl/ir_structure_splitting.cpp View File

@@ -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);

+ 1
- 1
src/glsl/ir_tree_grafting.cpp View File

@@ -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 ||

Loading…
Cancel
Save