RPCS3/glslang
1
0
Fork 0
mirror of https://github.com/RPCS3/glslang.git synced 2025-02-24 04:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2715 from greg-lunarg/i2714

Browse Source 
Allow layout(std430) uniform with GL_EXT_scalar_block_layout
This commit is contained in:
Greg Fischer 2021-07-30 16:12:21 -06:00 committed by GitHub
commit 50849374cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
};
layout (std430) uniform;
void main()
{
}

2
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -3675,7 +3675,7 @@ void TParseContext::globalQualifierFixCheck(const TSourceLoc& loc, TQualifier& q
if (blockName == nullptr &&
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;
default: