X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=a2f43a9d18418d1941f5709cbc27fa99cfd35c73;hp=811679f3295c320b30d2caaf8bb92d7ac164f992;hb=efbce87192ce73ba577684369f759693dccec67c;hpb=ea844415db7fb7705ecbfea9cf27df2a8f00b802 diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp index 811679f3..a2f43a9d 100644 --- a/source/glsl/reflect.cpp +++ b/source/glsl/reflect.cpp @@ -311,12 +311,7 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct) void MemoryRequirementsCalculator::visit(VariableDeclaration &var) { - if(var.layout) - { - auto i = find_member(var.layout->qualifiers, string("offset"), &Layout::Qualifier::name); - if(i!=var.layout->qualifiers.end()) - r_offset = i->value; - } + r_offset = get_layout_value(var.layout.get(), "offset"); if(var.type_declaration) var.type_declaration->visit(*this);