glsl: make sampler/image scalar types

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

diff --git a/src/compiler/nir_types.h b/src/compiler/nir_types.h
index 9088a064cf75bc008edf3bc95d08416409e78e66..0c52bb9705d9c9c26e1f485ca7b8ce82afec08b0 100644 (file)
--- a/src/compiler/nir_types.h
+++ b/src/compiler/nir_types.h
@@ -25,7 +25,8 @@
  *
  */
 
-#pragma once
+#ifndef NIR_TYPES_H
+#define NIR_TYPES_H
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -92,6 +93,8 @@ glsl_get_bit_size(const struct glsl_type *type)
       return 32;
 
    case GLSL_TYPE_DOUBLE:
+   case GLSL_TYPE_INT64:
+   case GLSL_TYPE_UINT64:
       return 64;
 
    default:
@@ -126,6 +129,8 @@ const struct glsl_type *glsl_dvec_type(unsigned n);
 const struct glsl_type *glsl_vec4_type(void);
 const struct glsl_type *glsl_int_type(void);
 const struct glsl_type *glsl_uint_type(void);
+const struct glsl_type *glsl_int64_t_type(void);
+const struct glsl_type *glsl_uint64_t_type(void);
 const struct glsl_type *glsl_bool_type(void);
 
 const struct glsl_type *glsl_scalar_type(enum glsl_base_type base_type);
@@ -137,6 +142,11 @@ const struct glsl_type *glsl_array_type(const struct glsl_type *base,
                                         unsigned elements);
 const struct glsl_type *glsl_struct_type(const struct glsl_struct_field *fields,
                                          unsigned num_fields, const char *name);
+const struct glsl_type *glsl_interface_type(const struct glsl_struct_field *fields,
+                                            unsigned num_fields,
+                                            enum glsl_interface_packing packing,
+                                            bool row_major,
+                                            const char *block_name);
 const struct glsl_type *glsl_sampler_type(enum glsl_sampler_dim dim,
                                           bool is_shadow, bool is_array,
                                           enum glsl_base_type base_type);
@@ -153,3 +163,5 @@ const struct glsl_type *glsl_transposed_type(const struct glsl_type *type);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* NIR_TYPES_H */