#endif
enum glsl_base_type {
+ /* Note: GLSL_TYPE_UINT, GLSL_TYPE_INT, and GLSL_TYPE_FLOAT must be 0, 1,
+ * and 2 so that they will fit in the 2 bits of glsl_type::sampled_type.
+ */
GLSL_TYPE_UINT = 0,
GLSL_TYPE_INT,
GLSL_TYPE_FLOAT,
GLSL_TYPE_DOUBLE,
+ GLSL_TYPE_UINT64,
+ GLSL_TYPE_INT64,
GLSL_TYPE_BOOL,
GLSL_TYPE_SAMPLER,
GLSL_TYPE_IMAGE,
GLSL_TYPE_ARRAY,
GLSL_TYPE_VOID,
GLSL_TYPE_SUBROUTINE,
+ GLSL_TYPE_FUNCTION,
GLSL_TYPE_ERROR
};
+static inline bool glsl_base_type_is_64bit(enum glsl_base_type type)
+{
+ return type == GLSL_TYPE_DOUBLE ||
+ type == GLSL_TYPE_UINT64 ||
+ type == GLSL_TYPE_INT64;
+}
+
enum glsl_sampler_dim {
GLSL_SAMPLER_DIM_1D = 0,
GLSL_SAMPLER_DIM_2D,
GLSL_SAMPLER_DIM_RECT,
GLSL_SAMPLER_DIM_BUF,
GLSL_SAMPLER_DIM_EXTERNAL,
- GLSL_SAMPLER_DIM_MS
+ GLSL_SAMPLER_DIM_MS,
+ GLSL_SAMPLER_DIM_SUBPASS, /* for vulkan input attachments */
+ GLSL_SAMPLER_DIM_SUBPASS_MS, /* for multisampled vulkan input attachments */
};
enum glsl_interface_packing {
GLenum gl_type;
glsl_base_type base_type;
- unsigned sampler_dimensionality:3; /**< \see glsl_sampler_dim */
+ unsigned sampler_dimensionality:4; /**< \see glsl_sampler_dim */
unsigned sampler_shadow:1;
unsigned sampler_array:1;
- unsigned sampler_type:2; /**< Type of data returned using this
+ unsigned sampled_type:2; /**< Type of data returned using this
* sampler or image. Only \c
* GLSL_TYPE_FLOAT, \c GLSL_TYPE_INT,
* and \c GLSL_TYPE_UINT are valid.
*/
unsigned interface_packing:2;
+ unsigned interface_row_major:1;
/* Callers of this ralloc-based new need not call delete. It's
* easier to just ralloc_free 'mem_ctx' (or any of its ancestors). */
*/
union {
const struct glsl_type *array; /**< Type of array elements. */
- const struct glsl_type *parameters; /**< Parameters to function. */
+ struct glsl_function_param *parameters; /**< Parameters to function. */
struct glsl_struct_field *structure; /**< List of struct fields. */
} fields;
static const glsl_type *ivec(unsigned components);
static const glsl_type *uvec(unsigned components);
static const glsl_type *bvec(unsigned components);
+ static const glsl_type *i64vec(unsigned components);
+ static const glsl_type *u64vec(unsigned components);
/**@}*/
/**
bool array,
glsl_base_type type);
+ static const glsl_type *get_image_instance(enum glsl_sampler_dim dim,
+ bool array, glsl_base_type type);
/**
* Get the instance of an array type
static const glsl_type *get_interface_instance(const glsl_struct_field *fields,
unsigned num_fields,
enum glsl_interface_packing packing,
+ bool row_major,
const char *block_name);
/**
*/
static const glsl_type *get_subroutine_instance(const char *subroutine_name);
+ /**
+ * Get the instance of a function type
+ */
+ static const glsl_type *get_function_instance(const struct glsl_type *return_type,
+ const glsl_function_param *parameters,
+ unsigned num_params);
+
/**
* Get the type resulting from a multiplication of \p type_a * \p type_b
*/
*/
unsigned uniform_locations() const;
+ /**
+ * Used to count the number of varyings contained in the type ignoring
+ * innermost array elements.
+ */
+ unsigned varying_count() const;
+
/**
* Calculate the number of attribute slots required to hold this type
*
* For vertex shader attributes - doubles only take one slot.
* For inter-shader varyings - dvec3/dvec4 take two slots.
*/
- unsigned count_attribute_slots(bool vertex_input_slots) const;
+ unsigned count_attribute_slots(bool is_vertex_input) const;
/**
* Alignment in bytes of the start of this type in a std140 uniform
*/
bool is_numeric() const
{
- return (base_type >= GLSL_TYPE_UINT) && (base_type <= GLSL_TYPE_DOUBLE);
+ return (base_type >= GLSL_TYPE_UINT) && (base_type <= GLSL_TYPE_INT64);
}
/**
return (base_type == GLSL_TYPE_UINT) || (base_type == GLSL_TYPE_INT);
}
+ /**
+ * Query whether or not a type is a 32-bit or 64-bit integer
+ */
+ bool is_integer_32_64() const
+ {
+ return (base_type == GLSL_TYPE_UINT) || (base_type == GLSL_TYPE_INT) ||
+ (base_type == GLSL_TYPE_UINT64) || (base_type == GLSL_TYPE_INT64);
+ }
+
/**
* Query whether or not type is an integral type, or for struct and array
* types, contains an integral type.
bool contains_integer() const;
/**
- * Query whether or not type is a double type, or for struct and array
- * types, contains a double type.
+ * Query whether or not type is a double type, or for struct, interface and
+ * array types, contains a double type.
*/
bool contains_double() const;
}
/**
- * Query whether a double takes two slots.
+ * Query whether a 64-bit type takes two slots.
*/
- bool is_dual_slot_double() const
+ bool is_dual_slot() const
{
- return base_type == GLSL_TYPE_DOUBLE && vector_elements > 2;
+ return is_64bit() && vector_elements > 2;
+ }
+
+ /**
+ * Query whether or not a type is 64-bit
+ */
+ bool is_64bit() const
+ {
+ return glsl_base_type_is_64bit(base_type);
}
/**
}
/**
- * Query whether or not type is a sampler, or for struct and array
- * types, contains a sampler.
+ * Query whether or not type is a sampler, or for struct, interface and
+ * array types, contains a sampler.
*/
bool contains_sampler() const;
gl_texture_index sampler_index() const;
/**
- * Query whether or not type is an image, or for struct and array
- * types, contains an image.
+ * Query whether or not type is an image, or for struct, interface and
+ * array types, contains an image.
*/
bool contains_image() const;
*
* Note that this is often different than actual coordinate type used in
* a texturing built-in function, since those pack additional values (such
- * as the shadow comparitor or projector) into the coordinate type.
+ * as the shadow comparator or projector) into the coordinate type.
*/
int coordinate_components() const;
* Compare a record type against another record type.
*
* This is useful for matching record types declared across shader stages.
+ * The option to not match locations is to deal with places where the
+ * same struct is defined in a block which has a location set on it.
+ */
+ bool record_compare(const glsl_type *b, bool match_locations = true) const;
+
+ /**
+ * Get the type interface packing.
*/
- bool record_compare(const glsl_type *b) const;
+ enum glsl_interface_packing get_interface_packing() const
+ {
+ return (enum glsl_interface_packing)interface_packing;
+ }
+
+ /**
+ * Check if the type interface is row major
+ */
+ bool get_interface_row_major() const
+ {
+ return (bool) interface_row_major;
+ }
private:
/** Constructor for interface types */
glsl_type(const glsl_struct_field *fields, unsigned num_fields,
- enum glsl_interface_packing packing, const char *name);
+ enum glsl_interface_packing packing,
+ bool row_major, const char *name);
+
+ /** Constructor for interface types */
+ glsl_type(const glsl_type *return_type,
+ const glsl_function_param *params, unsigned num_params);
/** Constructor for array types */
glsl_type(const glsl_type *array, unsigned length);
/** Hash table containing the known subroutine types. */
static struct hash_table *subroutine_types;
+ /** Hash table containing the known function types. */
+ static struct hash_table *function_types;
+
static bool record_key_compare(const void *a, const void *b);
static unsigned record_key_hash(const void *key);
/*@}*/
};
+#undef DECL_TYPE
+#undef STRUCT_TYPE
+#endif /* __cplusplus */
+
struct glsl_struct_field {
const struct glsl_type *type;
const char *name;
*/
int location;
+ /**
+ * For interface blocks, members may have an explicit byte offset
+ * specified; -1 otherwise. Also used for xfb_offset layout qualifier.
+ *
+ * Unless used for xfb_offset this field is ignored for structs.
+ */
+ int offset;
+
+ /**
+ * For interface blocks, members may define a transform feedback buffer;
+ * -1 otherwise.
+ */
+ int xfb_buffer;
+
+ /**
+ * For interface blocks, members may define a transform feedback stride;
+ * -1 otherwise.
+ */
+ int xfb_stride;
+
/**
* For interface blocks, the interpolation mode (as in
* ir_variable::interpolation). 0 otherwise.
unsigned image_volatile:1;
unsigned image_restrict:1;
+ /**
+ * Any of the xfb_* qualifiers trigger the shader to be in transform
+ * feedback mode so we need to keep track of whether the buffer was
+ * explicitly set or if its just been assigned the default global value.
+ */
+ unsigned explicit_xfb_buffer:1;
+
+ unsigned implicit_sized_array:1;
+#ifdef __cplusplus
glsl_struct_field(const struct glsl_type *_type, const char *_name)
- : type(_type), name(_name), location(-1), interpolation(0), centroid(0),
+ : type(_type), name(_name), location(-1), offset(0), xfb_buffer(0),
+ xfb_stride(0), interpolation(0), centroid(0),
sample(0), matrix_layout(GLSL_MATRIX_LAYOUT_INHERITED), patch(0),
- precision(GLSL_PRECISION_NONE)
+ precision(GLSL_PRECISION_NONE), image_read_only(0), image_write_only(0),
+ image_coherent(0), image_volatile(0), image_restrict(0),
+ explicit_xfb_buffer(0), implicit_sized_array(0)
{
/* empty */
}
{
/* empty */
}
+#endif
+};
+
+struct glsl_function_param {
+ const struct glsl_type *type;
+
+ bool in;
+ bool out;
};
static inline unsigned int
return (a + align - 1) / align * align;
}
-#undef DECL_TYPE
-#undef STRUCT_TYPE
-#endif /* __cplusplus */
-
#endif /* GLSL_TYPES_H */
projects / mesa.git / blobdiff