glsl_type: Drop the glsl_get_array_instance C helper

It was added in bce6f9987522 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>

diff --git a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
index 0c12dea3e900af1d4ebcbbf518bf07df258eff7f..f3f2dd22df29cd5f2692442d3cf608a65263557a 100644 (file)
--- a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
+++ b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
@@ -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;
    }
 

diff --git a/src/compiler/nir/nir_lower_io_arrays_to_elements.c b/src/compiler/nir/nir_lower_io_arrays_to_elements.c
index 4453eaa1f48626b32dab700bd1c0e633e8901e20..30d53f156ff68f100f393ff3025795480e0baf6b 100644 (file)
--- a/src/compiler/nir/nir_lower_io_arrays_to_elements.c
+++ b/src/compiler/nir/nir_lower_io_arrays_to_elements.c
@@ -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;

diff --git a/src/compiler/nir/nir_split_per_member_structs.c b/src/compiler/nir/nir_split_per_member_structs.c
index 9bad351286341410971ab8354c2593a14d25c419..f649c8f474bf26eed521fa89b7ad39a0bc81f2a0 100644 (file)
--- a/src/compiler/nir/nir_split_per_member_structs.c
+++ b/src/compiler/nir/nir_split_per_member_structs.c
@@ -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));

diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index c8906dc6954ace1096f1379537b25d0f26d114f2..e0e37e2b28953ff56764c32bdc0c3301a925a620 100644 (file)
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -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)
 {

diff --git a/src/compiler/nir_types.h b/src/compiler/nir_types.h
index fe34cb9583742951f772f7b6e7509e2d8d20cb67..e7ffad43ad06038fc15a68da5ec9804d6ef8835e 100644 (file)
--- a/src/compiler/nir_types.h
+++ b/src/compiler/nir_types.h
@@ -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);