X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fcompiler%2Fnir_types.cpp;h=1fff15c7cd58d480d5792c30542267804e51515a;hp=69f89a7fd74ffa28afc714ef3dce7c626d13146e;hb=HEAD;hpb=0019d6152749fab000c12daf4d3c7b0d4fba2caf

diff --git a/src/compiler/nir_types.cpp b/src/compiler/nir_types.cpp
index 69f89a7fd74..1fff15c7cd5 100644
--- a/src/compiler/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -34,6 +34,12 @@ glsl_get_type_name(const glsl_type *type)
    return type->name;
 }
 
+int
+glsl_array_size(const struct glsl_type *type)
+{
+   return type->array_size();
+}
+
 const glsl_type *
 glsl_get_array_element(const glsl_type* type)
 {
@@ -152,6 +158,19 @@ glsl_get_aoa_size(const struct glsl_type *type)
    return type->arrays_of_arrays_size();
 }
 
+unsigned
+glsl_count_vec4_slots(const struct glsl_type *type,
+                      bool is_gl_vertex_input, bool is_bindless)
+{
+   return type->count_vec4_slots(is_gl_vertex_input, is_bindless);
+}
+
+unsigned
+glsl_count_dword_slots(const struct glsl_type *type, bool is_bindless)
+{
+   return type->count_dword_slots(is_bindless);
+}
+
 unsigned
 glsl_count_attribute_slots(const struct glsl_type *type,
                            bool is_gl_vertex_input)
@@ -279,6 +298,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)
 {
@@ -335,6 +360,13 @@ glsl_sampler_type_is_array(const struct glsl_type *type)
    return type->sampler_array;
 }
 
+bool
+glsl_struct_type_is_packed(const struct glsl_type *type)
+{
+   assert(glsl_type_is_struct(type));
+   return type->packed;
+}
+
 bool
 glsl_type_is_dual_slot(const struct glsl_type *type)
 {
@@ -508,6 +540,20 @@ glsl_array_type(const glsl_type *base, unsigned elements,
    return glsl_type::get_array_instance(base, elements, explicit_stride);
 }
 
+const glsl_type *
+glsl_replace_vector_type(const glsl_type *t, unsigned components)
+{
+   if (glsl_type_is_array(t)) {
+      return glsl_array_type(
+         glsl_replace_vector_type(t->fields.array, components), t->length,
+                                  t->explicit_stride);
+   } else if (glsl_type_is_vector_or_scalar(t)) {
+      return glsl_vector_type(t->base_type, components);
+   } else {
+      unreachable("Unhandled base type glsl_replace_vector_type()");
+   }
+}
+
 const glsl_type *
 glsl_struct_type(const glsl_struct_field *fields,
                  unsigned num_fields, const char *name,
@@ -540,6 +586,12 @@ glsl_bare_sampler_type()
    return glsl_type::sampler_type;
 }
 
+const struct glsl_type *
+glsl_bare_shadow_sampler_type()
+{
+   return glsl_type::samplerShadow_type;
+}
+
 const struct glsl_type *
 glsl_image_type(enum glsl_sampler_dim dim, bool is_array,
                 enum glsl_base_type base_type)
@@ -587,6 +639,24 @@ glsl_channel_type(const glsl_type *t)
    }
 }
 
+const glsl_type *
+glsl_float16_type(const struct glsl_type *type)
+{
+   return type->get_float16_type();
+}
+
+const glsl_type *
+glsl_int16_type(const struct glsl_type *type)
+{
+   return type->get_int16_type();
+}
+
+const glsl_type *
+glsl_uint16_type(const struct glsl_type *type)
+{
+   return type->get_uint16_type();
+}
+
 void
 glsl_get_natural_size_align_bytes(const struct glsl_type *type,
                                   unsigned *size, unsigned *align)
@@ -618,7 +688,7 @@ glsl_get_natural_size_align_bytes(const struct glsl_type *type,
    }
 
    case GLSL_TYPE_ARRAY: {
-      unsigned elem_size, elem_align;
+      unsigned elem_size = 0, elem_align = 0;
       glsl_get_natural_size_align_bytes(type->fields.array,
                                         &elem_size, &elem_align);
       *align = elem_align;
@@ -626,6 +696,7 @@ glsl_get_natural_size_align_bytes(const struct glsl_type *type,
       break;
    }
 
+   case GLSL_TYPE_INTERFACE:
    case GLSL_TYPE_STRUCT:
       *size = 0;
       *align = 0;
@@ -639,12 +710,16 @@ glsl_get_natural_size_align_bytes(const struct glsl_type *type,
       break;
 
    case GLSL_TYPE_SAMPLER:
+   case GLSL_TYPE_IMAGE:
+      /* Bindless samplers and images. */
+      *size = 8;
+      *align = 8;
+      break;
+
    case GLSL_TYPE_ATOMIC_UINT:
    case GLSL_TYPE_SUBROUTINE:
-   case GLSL_TYPE_IMAGE:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
-   case GLSL_TYPE_INTERFACE:
    case GLSL_TYPE_FUNCTION:
       unreachable("type does not have a natural size");
    }
@@ -668,6 +743,12 @@ glsl_contains_atomic(const struct glsl_type *type)
    return type->contains_atomic();
 }
 
+bool
+glsl_contains_opaque(const struct glsl_type *type)
+{
+   return type->contains_opaque();
+}
+
 int
 glsl_get_cl_size(const struct glsl_type *type)
 {
@@ -680,6 +761,14 @@ glsl_get_cl_alignment(const struct glsl_type *type)
    return type->cl_alignment();
 }
 
+void
+glsl_get_cl_type_size_align(const struct glsl_type *type,
+                            unsigned *size, unsigned *align)
+{
+   *size = glsl_get_cl_size(type);
+   *align = glsl_get_cl_alignment(type);
+}
+
 unsigned
 glsl_type_get_sampler_count(const struct glsl_type *type)
 {
@@ -688,7 +777,10 @@ glsl_type_get_sampler_count(const struct glsl_type *type)
               glsl_type_get_sampler_count(glsl_without_array(type)));
    }
 
-   if (glsl_type_is_struct_or_ifc(type)) {
+   /* Ignore interface blocks - they can only contain bindless samplers,
+    * which we shouldn't count.
+    */
+   if (glsl_type_is_struct(type)) {
       unsigned count = 0;
       for (unsigned i = 0; i < glsl_get_length(type); i++)
          count += glsl_type_get_sampler_count(glsl_get_struct_field(type, i));
@@ -709,7 +801,10 @@ glsl_type_get_image_count(const struct glsl_type *type)
               glsl_type_get_image_count(glsl_without_array(type)));
    }
 
-   if (glsl_type_is_struct_or_ifc(type)) {
+   /* Ignore interface blocks - they can only contain bindless images,
+    * which we shouldn't count.
+    */
+   if (glsl_type_is_struct(type)) {
       unsigned count = 0;
       for (unsigned i = 0; i < glsl_get_length(type); i++)
          count += glsl_type_get_image_count(glsl_get_struct_field(type, i));
@@ -722,8 +817,78 @@ glsl_type_get_image_count(const struct glsl_type *type)
    return 0;
 }
 
+enum glsl_interface_packing
+glsl_get_internal_ifc_packing(const struct glsl_type *type,
+                              bool std430_supported)
+{
+   return type->get_internal_ifc_packing(std430_supported);
+}
+
+enum glsl_interface_packing
+glsl_get_ifc_packing(const struct glsl_type *type)
+{
+   return type->get_interface_packing();
+}
+
+unsigned
+glsl_get_std140_base_alignment(const struct glsl_type *type, bool row_major)
+{
+   return type->std140_base_alignment(row_major);
+}
+
+unsigned
+glsl_get_std140_size(const struct glsl_type *type, bool row_major)
+{
+   return type->std140_size(row_major);
+}
+
+unsigned
+glsl_get_std430_base_alignment(const struct glsl_type *type, bool row_major)
+{
+   return type->std430_base_alignment(row_major);
+}
+
+unsigned
+glsl_get_std430_size(const struct glsl_type *type, bool row_major)
+{
+   return type->std430_size(row_major);
+}
+
 unsigned
 glsl_get_explicit_size(const struct glsl_type *type, bool align_to_stride)
 {
    return type->explicit_size(align_to_stride);
 }
+
+unsigned
+glsl_get_explicit_alignment(const struct glsl_type *type)
+{
+   return type->explicit_alignment;
+}
+
+bool
+glsl_type_is_packed(const struct glsl_type *type)
+{
+   return type->packed;
+}
+
+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);
+}