X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fnir_types.h;h=8d82f492e02f9f1e91008d6b593cba164664e077;hb=5b92392c483c8f15599ed48abc824e606e859b02;hp=877edda6389b64afbf9d4502700a4911774a87c1;hpb=262b611a5bb08ebb8d2876bc44a44952d610a248;p=mesa.git

diff --git a/src/compiler/nir_types.h b/src/compiler/nir_types.h
index 877edda6389..8d82f492e02 100644
--- a/src/compiler/nir_types.h
+++ b/src/compiler/nir_types.h
@@ -52,11 +52,20 @@ int glsl_get_struct_field_offset(const struct glsl_type *type,
 const struct glsl_struct_field *
 glsl_get_struct_field_data(const struct glsl_type *type, unsigned index);
 
-const enum glsl_interface_packing
+enum glsl_interface_packing
 glsl_get_internal_ifc_packing(const struct glsl_type *type,
                               bool std430_supported);
-
+enum glsl_interface_packing
+glsl_get_ifc_packing(const struct glsl_type *type);
+
+unsigned glsl_get_std140_base_alignment(const struct glsl_type *type,
+                                        bool row_major);
+unsigned glsl_get_std140_size(const struct glsl_type *type, bool row_major);
+unsigned glsl_get_std430_base_alignment(const struct glsl_type *type,
+                                        bool row_major);
+unsigned glsl_get_std430_size(const struct glsl_type *type, bool row_major);
 unsigned glsl_get_explicit_stride(const struct glsl_type *type);
+int glsl_array_size(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);
@@ -109,6 +118,9 @@ int glsl_get_cl_size(const struct glsl_type *type);
 
 int glsl_get_cl_alignment(const struct glsl_type *type);
 
+void glsl_get_cl_type_size_align(const struct glsl_type *type,
+                                 unsigned *size, unsigned *align);
+
 unsigned glsl_get_explicit_size(const struct glsl_type *type, bool align_to_stride);
 
 static inline unsigned
@@ -143,6 +155,7 @@ bool glsl_type_is_integer(const struct glsl_type *type);
 bool glsl_type_contains_64bit(const struct glsl_type *type);
 bool glsl_sampler_type_is_shadow(const struct glsl_type *type);
 bool glsl_sampler_type_is_array(const struct glsl_type *type);
+bool glsl_struct_type_is_packed(const struct glsl_type *type);
 bool glsl_contains_atomic(const struct glsl_type *type);
 bool glsl_contains_opaque(const struct glsl_type *type);
 
@@ -191,6 +204,7 @@ const struct glsl_type *glsl_sampler_type(enum glsl_sampler_dim dim,
                                           bool is_shadow, bool is_array,
                                           enum glsl_base_type base_type);
 const struct glsl_type *glsl_bare_sampler_type();
+const struct glsl_type *glsl_bare_shadow_sampler_type();
 const struct glsl_type *glsl_image_type(enum glsl_sampler_dim dim,
                                         bool is_array,
                                         enum glsl_base_type base_type);
@@ -203,6 +217,8 @@ const struct glsl_type *glsl_transposed_type(const struct glsl_type *type);
 const struct glsl_type *glsl_channel_type(const struct glsl_type *type);
 
 const struct glsl_type *glsl_float16_type(const struct glsl_type *type);
+const struct glsl_type *glsl_int16_type(const struct glsl_type *type);
+const struct glsl_type *glsl_uint16_type(const struct glsl_type *type);
 
 void glsl_get_natural_size_align_bytes(const struct glsl_type *type,
                                        unsigned *size, unsigned *align);