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.
---
src/glsl/glsl_types.cpp | 8 ++++----
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 4782d15..c4c04fe 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 61c8635..e60c191 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
--
1.8.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
