Use extended alignment in SPIR-V struct layout when necessary

[libs/gl.git] / source / glsl / reflect.cpp

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index a2f43a9d18418d1941f5709cbc27fa99cfd35c73..a1ffcd3d449783caf24aa9c79d4c403199972234 100644 (file)
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -284,6 +284,9 @@ void MemoryRequirementsCalculator::visit(BasicTypeDeclaration &basic)
        }
        else if(basic.kind==BasicTypeDeclaration::ARRAY)
                basic.base_type->visit(*this);
+
+       if(basic.extended_alignment)
+               r_alignment = (r_alignment+15)&~15U;
 }
 
 void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
@@ -296,7 +299,7 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
                r_alignment = 1;
                r_offset = -1;
                s->visit(*this);
-               if(r_offset)
+               if(r_offset>=0)
                        total = r_offset;
                total += r_alignment-1;
                total -= total%r_alignment;
@@ -305,6 +308,8 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
        }
        r_size = total;
        r_alignment = max_align;
+       if(strct.extended_alignment)
+               r_alignment = (r_alignment+15)&~15U;
        r_size += r_alignment-1;
        r_size -= r_size%r_alignment;
 }