Browse Source

glsl_type: Record type constructors are private

tags/mesa-7.9-rc1
Ian Romanick 15 years ago
parent
commit
72e627d02a
2 changed files with 16 additions and 12 deletions
  1. 12
    0
      src/glsl/glsl_types.cpp
  2. 4
    12
      src/glsl/glsl_types.h

+ 12
- 0
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,

+ 4
- 12
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);


Loading…
Cancel
Save