mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow layout(std430) uniform with GL_EXT_scalar_block_layout

Browse Source
This commit is contained in:
Greg Fischer 2021-07-30 11:11:16 -06:00
parent 0db0010d3c
commit 27384e04f6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/spv.scalarlayout.frag
View File

@ -27,6 +27,8 @@ layout(column_major, scalar) uniform B1
S i[2]; // offset = 160 (aligned to multiple of 8) stride = 48 S i[2]; // offset = 160 (aligned to multiple of 8) stride = 48
}; };
layout (std430) uniform;
void main() void main()
{ {
} }

2
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -3675,7 +3675,7 @@ void TParseContext::globalQualifierFixCheck(const TSourceLoc& loc, TQualifier& q
if (blockName == nullptr && if (blockName == nullptr &&
qualifier.layoutPacking == ElpStd430) qualifier.layoutPacking == ElpStd430)
{ {
error(loc, "it is invalid to declare std430 qualifier on uniform", "", ""); requireExtensions(loc, 1, &E_GL_EXT_scalar_block_layout, "default std430 layout for uniform");
} }
break; break;
default: default: