projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../mesa into vulkan
[mesa.git]
/
src
/
glsl
/
nir
/
nir_types.cpp
diff --git
a/src/glsl/nir/nir_types.cpp
b/src/glsl/nir/nir_types.cpp
index 809a7cff79c7730f934307b01e59c166a09cb2b9..01f0e9b5abcc6a17bdd7fd47423a8349609f1175 100644
(file)
--- a/
src/glsl/nir/nir_types.cpp
+++ b/
src/glsl/nir/nir_types.cpp
@@
-138,6
+138,13
@@
glsl_get_sampler_result_type(const struct glsl_type *type)
return (glsl_base_type)type->sampler_type;
}
return (glsl_base_type)type->sampler_type;
}
+unsigned
+glsl_get_record_location_offset(const struct glsl_type *type,
+ unsigned length)
+{
+ return type->record_location_offset(length);
+}
+
bool
glsl_type_is_void(const glsl_type *type)
{
bool
glsl_type_is_void(const glsl_type *type)
{
@@
-252,7
+259,7
@@
glsl_vector_type(enum glsl_base_type base_type, unsigned components)
const glsl_type *
glsl_matrix_type(enum glsl_base_type base_type, unsigned rows, unsigned columns)
{
const glsl_type *
glsl_matrix_type(enum glsl_base_type base_type, unsigned rows, unsigned columns)
{
- assert(rows > 1 && rows <= 4 && columns > 1 && columns <= 4);
+ assert(rows > 1 && rows <= 4 && columns >
=
1 && columns <= 4);
return glsl_type::get_instance(base_type, rows, columns);
}
return glsl_type::get_instance(base_type, rows, columns);
}