glsl/tests: Handle windows \r\n new lines

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

diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index e2dfc40ff0b0c37ab6c4ac7c26a5c6e42691f973..aa4a7df0cbe87c5904e2e4ef51db67797e6647ca 100644 (file)
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -279,6 +279,12 @@ glsl_type_is_array(const struct glsl_type *type)
    return type->is_array();
 }
 
+bool
+glsl_type_is_unsized_array(const struct glsl_type *type)
+{
+   return type->is_unsized_array();
+}
+
 bool
 glsl_type_is_array_of_arrays(const struct glsl_type *type)
 {
@@ -721,3 +727,30 @@ glsl_type_get_image_count(const struct glsl_type *type)
 
    return 0;
 }
+
+unsigned
+glsl_get_explicit_size(const struct glsl_type *type, bool align_to_stride)
+{
+   return type->explicit_size(align_to_stride);
+}
+
+bool
+glsl_type_is_leaf(const struct glsl_type *type)
+{
+   if (glsl_type_is_struct_or_ifc(type) ||
+       (glsl_type_is_array(type) &&
+        (glsl_type_is_array(glsl_get_array_element(type)) ||
+         glsl_type_is_struct_or_ifc(glsl_get_array_element(type))))) {
+      return false;
+   } else {
+      return true;
+   }
+}
+
+const struct glsl_type *
+glsl_get_explicit_type_for_size_align(const struct glsl_type *type,
+                                      glsl_type_size_align_func type_info,
+                                      unsigned *size, unsigned *align)
+{
+   return type->get_explicit_type_for_size_align(type_info, size, align);
+}