glsl: fix heap-buffer-overflow

[mesa.git] / src / compiler / nir_types.cpp

diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index f694a84e72c541c5dbfb9705a280628516716618..cc90efd2ae7e59a330a4e0fa0033493bd4f159c5 100644 (file)
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -28,32 +28,10 @@
 #include "nir_types.h"
 #include "compiler/glsl/ir.h"
 
-void
-glsl_print_type(const glsl_type *type, FILE *fp)
-{
-   if (type->base_type == GLSL_TYPE_ARRAY) {
-      glsl_print_type(type->fields.array, fp);
-      fprintf(fp, "[%u]", type->length);
-   } else if ((type->base_type == GLSL_TYPE_STRUCT)
-              && !is_gl_identifier(type->name)) {
-      fprintf(fp, "%s@%p", type->name, (void *) type);
-   } else {
-      fprintf(fp, "%s", type->name);
-   }
-}
-
-void
-glsl_print_struct(const glsl_type *type, FILE *fp)
+const char *
+glsl_get_type_name(const glsl_type *type)
 {
-   assert(type->base_type == GLSL_TYPE_STRUCT);
-
-   fprintf(fp, "struct {\n");
-   for (unsigned i = 0; i < type->length; i++) {
-      fprintf(fp, "\t");
-      glsl_print_type(type->fields.structure[i].type, fp);
-      fprintf(fp, " %s;\n", type->fields.structure[i].name);
-   }
-   fprintf(fp, "}\n");
+   return type->name;
 }
 
 const glsl_type *
@@ -206,6 +184,12 @@ glsl_type_is_array(const struct glsl_type *type)
    return type->is_array();
 }
 
+bool
+glsl_type_is_array_of_arrays(const struct glsl_type *type)
+{
+   return type->is_array_of_arrays();
+}
+
 bool
 glsl_type_is_struct(const struct glsl_type *type)
 {
@@ -238,6 +222,24 @@ glsl_sampler_type_is_array(const struct glsl_type *type)
    return type->sampler_array;
 }
 
+bool
+glsl_type_is_dual_slot(const struct glsl_type *type)
+{
+   return type->is_dual_slot();
+}
+
+bool
+glsl_type_is_numeric(const struct glsl_type *type)
+{
+   return type->is_numeric();
+}
+
+bool
+glsl_type_is_boolean(const struct glsl_type *type)
+{
+   return type->is_boolean();
+}
+
 const glsl_type *
 glsl_void_type(void)
 {