@@ -1267,7 +1267,7 @@ _slang_first_function(struct slang_function_scope_ *scope, const char *name) | |||
slang_function * | |||
_slang_locate_function(const slang_function_scope * funcs, slang_atom a_name, | |||
const slang_operation * args, GLuint num_args, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_atom_pool * atoms) | |||
{ | |||
GLuint i; |
@@ -339,7 +339,7 @@ static GLboolean | |||
parse_array_len(slang_parse_ctx * C, slang_output_ctx * O, GLuint * len) | |||
{ | |||
slang_operation array_size; | |||
slang_assembly_name_space space; | |||
slang_name_space space; | |||
GLboolean result; | |||
if (!slang_operation_construct(&array_size)) |
@@ -90,7 +90,7 @@ _slang_lookup_constant(const char *name) | |||
*/ | |||
void | |||
_slang_simplify(slang_operation *oper, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_atom_pool * atoms) | |||
{ | |||
GLboolean isFloat[4]; | |||
@@ -275,7 +275,7 @@ _slang_simplify(slang_operation *oper, | |||
*/ | |||
GLboolean | |||
_slang_adapt_call(slang_operation *callOper, const slang_function *fun, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_atom_pool * atoms) | |||
{ | |||
const GLboolean haveRetValue = _slang_function_has_return_value(fun); |
@@ -9,13 +9,13 @@ _slang_lookup_constant(const char *name); | |||
extern void | |||
_slang_simplify(slang_operation *oper, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_atom_pool * atoms); | |||
extern GLboolean | |||
_slang_adapt_call(slang_operation *callOper, const slang_function *fun, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_atom_pool * atoms); | |||
@@ -257,7 +257,7 @@ slang_assembly_typeinfo_destruct(slang_assembly_typeinfo * ti) | |||
static GLboolean | |||
typeof_existing_function(const char *name, const slang_operation * params, | |||
GLuint num_params, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_type_specifier * spec, | |||
slang_atom_pool * atoms) | |||
{ | |||
@@ -290,7 +290,7 @@ _slang_typeof_operation(const slang_assemble_ctx * A, | |||
*/ | |||
GLboolean | |||
_slang_typeof_operation_(const slang_operation * op, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_assembly_typeinfo * ti, | |||
slang_atom_pool * atoms) | |||
{ | |||
@@ -616,7 +616,7 @@ _slang_typeof_operation_(const slang_operation * op, | |||
GLboolean | |||
_slang_typeof_function(slang_atom a_name, const slang_operation * params, | |||
GLuint num_params, | |||
const slang_assembly_name_space * space, | |||
const slang_name_space * space, | |||
slang_type_specifier * spec, GLboolean * exists, | |||
slang_atom_pool * atoms) | |||
{ |
@@ -46,18 +46,18 @@ typedef struct slang_swizzle_ | |||
GLuint swizzle[4]; | |||
} slang_swizzle; | |||
typedef struct slang_assembly_name_space_ | |||
typedef struct slang_name_space_ | |||
{ | |||
struct slang_function_scope_ *funcs; | |||
struct slang_struct_scope_ *structs; | |||
struct slang_variable_scope_ *vars; | |||
} slang_assembly_name_space; | |||
} slang_name_space; | |||
typedef struct slang_assemble_ctx_ | |||
{ | |||
slang_atom_pool *atoms; | |||
slang_assembly_name_space space; | |||
slang_name_space space; | |||
slang_swizzle swz; | |||
struct gl_program *program; | |||
slang_var_table *vartable; | |||
@@ -71,7 +71,7 @@ extern struct slang_function_ * | |||
_slang_locate_function(const struct slang_function_scope_ *funcs, | |||
slang_atom name, const struct slang_operation_ *params, | |||
GLuint num_params, | |||
const slang_assembly_name_space *space, | |||
const slang_name_space *space, | |||
slang_atom_pool *); | |||
@@ -171,7 +171,7 @@ _slang_typeof_operation(const slang_assemble_ctx *, | |||
extern GLboolean | |||
_slang_typeof_operation_(const struct slang_operation_ *, | |||
const slang_assembly_name_space *, | |||
const slang_name_space *, | |||
slang_assembly_typeinfo *, slang_atom_pool *); | |||
/** | |||
@@ -182,7 +182,7 @@ _slang_typeof_operation_(const struct slang_operation_ *, | |||
extern GLboolean | |||
_slang_typeof_function(slang_atom a_name, | |||
const struct slang_operation_ *params, | |||
GLuint num_params, const slang_assembly_name_space *, | |||
GLuint num_params, const slang_name_space *, | |||
slang_type_specifier *spec, GLboolean *exists, | |||
slang_atom_pool *); | |||