fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Add unsized array support to glsl_type::std140_size()

Browse source 
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Samuel Iglesias Gonsalvez 2015-09-21 09:09:11 +02:00
parent 68f5a4e6d2
commit 1440d2a683
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/glsl/glsl_types.cpp
View file

@ -1351,7 +1351,7 @@ glsl_type::std140_size(bool row_major) const
* rounded up to the next multiple of the base alignment of the
* structure.
*/
if (this->is_record()) {
if (this->is_record() || this->is_interface()) {
unsigned size = 0;
unsigned max_align = 0;
@ -1367,6 +1367,11 @@ glsl_type::std140_size(bool row_major) const
const struct glsl_type *field_type = this->fields.structure[i].type;
unsigned align = field_type->std140_base_alignment(field_row_major);
/* Ignore unsized arrays when calculating size */
if (field_type->is_unsized_array())
continue;
size = glsl_align(size, align);
size += field_type->std140_size(field_row_major);