fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl_type: Record type constructors are private

Browse source
This commit is contained in:
Ian Romanick 2010-06-28 11:57:38 -07:00
parent 49e3577b91
commit 72e627d02a
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/glsl/glsl_types.cpp
View file

@ -65,6 +65,18 @@ glsl_type::glsl_type(GLenum gl_type,
memset(& fields, 0, sizeof(fields));
}
glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
const char *name) :
base_type(GLSL_TYPE_STRUCT),
sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
sampler_type(0),
vector_elements(0), matrix_columns(0),
name(name),
length(num_fields)
{
this->fields.structure = fields;
}
static void
add_types_to_symbol_table(glsl_symbol_table *symtab,
const struct glsl_type *types,

16
src/glsl/glsl_types.h
View file

@ -158,18 +158,6 @@ struct glsl_type {
/*@}*/
glsl_type(const glsl_struct_field *fields, unsigned num_fields,
const char *name) :
base_type(GLSL_TYPE_STRUCT),
sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
sampler_type(0),
vector_elements(0), matrix_columns(0),
name(name),
length(num_fields)
{
this->fields.structure = fields;
}
/**
* For numeric and boolean derrived types returns the basic scalar type
*
@ -404,6 +392,10 @@ private:
enum glsl_sampler_dim dim, bool shadow, bool array,
unsigned type, const char *name);
/** Constructor for record types */
glsl_type(const glsl_struct_field *fields, unsigned num_fields,
const char *name);
/** Constructor for array types */
glsl_type(void *ctx, const glsl_type *array, unsigned length);