KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compiler/types: Make booleans 32-bit for cl_size/align 

OpenCL doesn't mandate a size and this is consistent with the rest of
the glsl_type system.  While we're here, we also clean ::cl_size() up a
bit and use a new explicit_type_scalar_byte_size() helper.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6472>
This commit is contained in:
Jason Ekstrand 2020-09-01 16:24:19 -05:00 committed by Marge Bot
parent 3be890a3a6
commit ca11b17b7b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/glsl_types.cpp
View File

@ -2427,6 +2427,15 @@ glsl_type::get_explicit_interface_type(bool supports_std430) const
}
}
static unsigned
explicit_type_scalar_byte_size(const glsl_type *type)
{
if (type->base_type == GLSL_TYPE_BOOL)
return 4;
else
return glsl_base_type_get_bit_size(type->base_type) / 8;
}
/* This differs from get_explicit_std430_type() in that it:
* - can size arrays slightly smaller ("stride * (len - 1) + elem_size" instead
* of "stride * len")
@ -2951,11 +2960,9 @@ glsl_type::cl_alignment() const
unsigned
glsl_type::cl_size() const
{
if (this->is_scalar()) {
return glsl_base_type_get_bit_size(this->base_type) / 8;
} else if (this->is_vector()) {
unsigned vec_elemns = this->vector_elements == 3 ? 4 : this->vector_elements;
return vec_elemns * glsl_base_type_get_bit_size(this->base_type) / 8;
if (this->is_scalar() || this->is_vector()) {
return util_next_power_of_two(this->vector_elements) *
explicit_type_scalar_byte_size(this);
} else if (this->is_array()) {
unsigned size = this->without_array()->cl_size();
return size * this->length;