LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-21 13:09:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment of storage buffers with vec3 or mat3 components.

Browse Source
This commit is contained in:
Alex Szpakowski
2021-11-06 11:17:23 -03:00
parent 041aa2fc23
commit 68977ec311
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Buffer.cpp
+15 -4
View File
@@ -147,11 +147,22 @@ Buffer::Buffer(Graphics *gfx, const Settings &settings, const std::vector<DataDe
// GLSL's std430 packing rules. We also assume all matrices are // GLSL's std430 packing rules. We also assume all matrices are
// column-major. // column-major.
if (info.isMatrix) // https://www.khronos.org/registry/OpenGL/specs/gl/glspec46.core.pdf
alignment = info.matrixRows * info.componentSize;
else
alignment = info.components * info.componentSize;
// "If the member is a column-major matrix with C columns and R rows,
// the matrix is stored identically to an array of C column vectors
// with R components each".
// "If the member is a three-component vector with components
// consuming N basic machine units, the base alignment is 4N."
int components = info.isMatrix ? info.matrixRows : info.components;
if (components == 3)
alignment = 4 * info.componentSize;
else
alignment = components * info.componentSize;
// "If the member is a structure, the base alignment of the structure
// is N, where N is the largest base alignment value of any of its
// members"
structurealignment = std::max(structurealignment, alignment); structurealignment = std::max(structurealignment, alignment);
memberoffset = alignUp(memberoffset, alignment); memberoffset = alignUp(memberoffset, alignment);