diff options
| author | Paul Berry <[email protected]> | 2013-10-08 14:09:48 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-10-09 16:49:16 -0700 |
| commit | 8cf35c3d2f8f40215f9fe00bdec6329aca2afc78 (patch) | |
| tree | b9b103fcb1c7244609d3828037eabb500045aea3 | |
| parent | b330125790498f44e5325ef30b7a1e0fd7245680 (diff) | |
glsl: Rename the fourth argument to get_interface_instance.
Interface declarations have two names associated with them: the block
name and the instance name. It's the block name that needs to be
passed to get_interface_instance(). This patch renames the argument
so that there's no confusion.
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/glsl/glsl_types.cpp | 8 | ||||
| -rw-r--r-- | src/glsl/glsl_types.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 4782d159df2..c4c04fe32ec 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -509,9 +509,9 @@ const glsl_type * glsl_type::get_interface_instance(const glsl_struct_field *fields, unsigned num_fields, enum glsl_interface_packing packing, - const char *name) + const char *block_name) { - const glsl_type key(fields, num_fields, packing, name); + const glsl_type key(fields, num_fields, packing, block_name); if (interface_types == NULL) { interface_types = hash_table_ctor(64, record_key_hash, record_key_compare); @@ -519,14 +519,14 @@ glsl_type::get_interface_instance(const glsl_struct_field *fields, const glsl_type *t = (glsl_type *) hash_table_find(interface_types, & key); if (t == NULL) { - t = new glsl_type(fields, num_fields, packing, name); + t = new glsl_type(fields, num_fields, packing, block_name); hash_table_insert(interface_types, (void *) t, t); } assert(t->base_type == GLSL_TYPE_INTERFACE); assert(t->length == num_fields); - assert(strcmp(t->name, name) == 0); + assert(strcmp(t->name, block_name) == 0); return t; } diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 61c86358ad0..e60c19132d6 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -234,7 +234,7 @@ struct glsl_type { static const glsl_type *get_interface_instance(const glsl_struct_field *fields, unsigned num_fields, enum glsl_interface_packing packing, - const char *name); + const char *block_name); /** * Query the total number of scalars that make up a scalar, vector or matrix |