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

compiler/types: Don't place members in the previous substruct's end padding

Browse source 
With the following structures :

  struct StructA
  {
     uint64_t value0;
     uint8_t  value1;
  };

  struct TopStruct
  {
     struct StructA a;
     uint8_t value3;
  };

Currently offsetof(struct TopStruct, value3) = 9. While the same code
on the CPU gives offsetof(struct TopStruct, value3) = 16.

This is impacting OpenCL kernels we're trying to use to build
acceleration structures.

v2: Add comment/link to some description of the alignment/size
    computation

Cc: mesa-stable
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16940>
This commit is contained in:
Jason Ekstrand 2020-10-24 13:28:39 -05:00 • committed by Marge Bot
parent 2aeb83117a
commit 133620196d
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/glsl_types.cpp
View file

@ -2761,6 +2761,16 @@ glsl_type::get_explicit_type_for_size_align(glsl_type_size_align_func type_info,
*size = fields[i].offset + field_size;
*alignment = MAX2(*alignment, field_align);
}
/*
* "The alignment of the struct is the alignment of the most-aligned
* field in it."
*
* "Finally, the size of the struct is the current offset rounded up to
* the nearest multiple of the struct's alignment."
*
* https://doc.rust-lang.org/reference/type-layout.html#reprc-structs
*/
*size = align(*size, *alignment);
const glsl_type *type;
if (this->is_struct()) {