glsl_type: Drop the glsl_get_array_instance C helper
It was added in bce6f99875
even though it's completely redundant with
glsl_array_type().
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:

committed by
Jason Ekstrand

parent
a700a82bda
commit
d34f19feba
@@ -99,7 +99,7 @@ remove_struct_derefs_prep(nir_deref_instr **p, char **name,
|
||||
|
||||
remove_struct_derefs_prep(&p[1], name, location, type);
|
||||
|
||||
*type = glsl_get_array_instance(*type, length);
|
||||
*type = glsl_array_type(*type, length);
|
||||
break;
|
||||
}
|
||||
|
||||
|
@@ -133,8 +133,7 @@ lower_array(nir_builder *b, nir_intrinsic_instr *intr, nir_variable *var,
|
||||
}
|
||||
|
||||
if (nir_is_per_vertex_io(var, b->shader->info.stage)) {
|
||||
type = glsl_get_array_instance(type,
|
||||
glsl_get_length(element->type));
|
||||
type = glsl_array_type(type, glsl_get_length(element->type));
|
||||
}
|
||||
|
||||
element->type = type;
|
||||
|
@@ -50,7 +50,7 @@ member_type(const struct glsl_type *type, unsigned index)
|
||||
if (glsl_type_is_array(type)) {
|
||||
const struct glsl_type *elem =
|
||||
member_type(glsl_get_array_element(type), index);
|
||||
return glsl_get_array_instance(elem, glsl_get_length(type));
|
||||
return glsl_array_type(elem, glsl_get_length(type));
|
||||
} else {
|
||||
assert(glsl_type_is_struct(type));
|
||||
assert(index < glsl_get_length(type));
|
||||
|
@@ -59,13 +59,6 @@ glsl_without_array_or_matrix(const glsl_type *type)
|
||||
return type;
|
||||
}
|
||||
|
||||
const glsl_type *
|
||||
glsl_get_array_instance(const glsl_type *type,
|
||||
unsigned array_size)
|
||||
{
|
||||
return glsl_type::get_array_instance(type, array_size);
|
||||
}
|
||||
|
||||
const glsl_type *
|
||||
glsl_get_struct_field(const glsl_type *type, unsigned index)
|
||||
{
|
||||
|
@@ -49,8 +49,6 @@ const struct glsl_type *glsl_get_struct_field(const struct glsl_type *type,
|
||||
const struct glsl_type *glsl_get_array_element(const struct glsl_type *type);
|
||||
const struct glsl_type *glsl_without_array(const struct glsl_type *type);
|
||||
const struct glsl_type *glsl_without_array_or_matrix(const struct glsl_type *type);
|
||||
const struct glsl_type *glsl_get_array_instance(const struct glsl_type *type,
|
||||
unsigned array_size);
|
||||
|
||||
const struct glsl_type *glsl_get_column_type(const struct glsl_type *type);
|
||||
|
||||
|
Reference in New Issue
Block a user