AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-14 22:01:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2598 from greg-lunarg/noprop1

Browse Source 
Do not propagate packing qualifiers to scalars or vectors
This commit is contained in:
Greg Fischer 2021-04-06 18:04:50 -06:00 committed by GitHub
commit 1481399549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Test/440.frag
View File

@ -151,3 +151,18 @@ int layer()
{ {
return gl_Layer; return gl_Layer;
} }
// The std140 layout qualifier should NOT propagate all the way down to
// the vec3. It is unnecessary and it breaks downstream AST consumers,
// notably LunarGlass.
struct PointLight_t
{
vec3 vPositionWs ;
} ;
layout( std140, row_major ) uniform PerViewLightData_t
{
PointLight_t g_pointLightData [ 128 ] ;
} ;

2
Test/baseResults/440.frag.out
View File

@ -118,6 +118,7 @@ ERROR: node is still EOpNull!
0:? 'aconst' ( global 4-element array of int) 0:? 'aconst' ( global 4-element array of int)
0:? 'bconst' ( global 64-element array of int) 0:? 'bconst' ( global 64-element array of int)
0:? 'sampInArray' ( smooth sample in 4-element array of 3-component vector of float) 0:? 'sampInArray' ( smooth sample in 4-element array of 3-component vector of float)
0:? 'anon@0' (layout( row_major std140) uniform block{layout( row_major std140 offset=0) uniform 128-element array of structure{ global 3-component vector of float vPositionWs} g_pointLightData})
Linked fragment stage: Linked fragment stage:
@ -162,4 +163,5 @@ ERROR: node is still EOpNull!
0:? 'aconst' ( global 4-element array of int) 0:? 'aconst' ( global 4-element array of int)
0:? 'bconst' ( global 64-element array of int) 0:? 'bconst' ( global 64-element array of int)
0:? 'sampInArray' ( smooth sample in 4-element array of 3-component vector of float) 0:? 'sampInArray' ( smooth sample in 4-element array of 3-component vector of float)
0:? 'anon@0' (layout( row_major std140) uniform block{layout( row_major std140 offset=0) uniform 128-element array of structure{ global 3-component vector of float vPositionWs} g_pointLightData})

1
glslang/Include/Types.h
View File

@ -1738,6 +1738,7 @@ public:
virtual bool isScalar() const { return ! isVector() && ! isMatrix() && ! isStruct() && ! isArray(); } virtual bool isScalar() const { return ! isVector() && ! isMatrix() && ! isStruct() && ! isArray(); }
virtual bool isScalarOrVec1() const { return isScalar() || vector1; } virtual bool isScalarOrVec1() const { return isScalar() || vector1; }
virtual bool isScalarOrVector() const { return !isMatrix() && !isStruct() && !isArray(); }
virtual bool isVector() const { return vectorSize > 1 || vector1; } virtual bool isVector() const { return vectorSize > 1 || vector1; }
virtual bool isMatrix() const { return matrixCols ? true : false; } virtual bool isMatrix() const { return matrixCols ? true : false; }
virtual bool isArray() const { return arraySizes != nullptr; } virtual bool isArray() const { return arraySizes != nullptr; }

10
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -8524,8 +8524,8 @@ void TParseContext::fixBlockUniformLayoutMatrix(TQualifier& qualifier, TTypeList
} }
// //
// Spread LayoutPacking to block member, if a block member is a struct, we need spread LayoutPacking to // Spread LayoutPacking to matrix or aggregate block members. If a block member is a struct or
// this struct member too. and keep this rule for recursive. // array of struct, spread LayoutPacking recursively to its matrix or aggregate members.
// //
void TParseContext::fixBlockUniformLayoutPacking(TQualifier& qualifier, TTypeList* originTypeList, void TParseContext::fixBlockUniformLayoutPacking(TQualifier& qualifier, TTypeList* originTypeList,
TTypeList* tmpTypeList) TTypeList* tmpTypeList)
@ -8534,11 +8534,13 @@ void TParseContext::fixBlockUniformLayoutPacking(TQualifier& qualifier, TTypeLis
for (unsigned int member = 0; member < originTypeList->size(); ++member) { for (unsigned int member = 0; member < originTypeList->size(); ++member) {
if (qualifier.layoutPacking != ElpNone) { if (qualifier.layoutPacking != ElpNone) {
if (tmpTypeList == nullptr) { if (tmpTypeList == nullptr) {
if ((*originTypeList)[member].type->getQualifier().layoutPacking == ElpNone) { if ((*originTypeList)[member].type->getQualifier().layoutPacking == ElpNone &&
!(*originTypeList)[member].type->isScalarOrVector()) {
(*originTypeList)[member].type->getQualifier().layoutPacking = qualifier.layoutPacking; (*originTypeList)[member].type->getQualifier().layoutPacking = qualifier.layoutPacking;
} }
} else { } else {
if ((*tmpTypeList)[member].type->getQualifier().layoutPacking == ElpNone) { if ((*tmpTypeList)[member].type->getQualifier().layoutPacking == ElpNone &&
!(*tmpTypeList)[member].type->isScalarOrVector()) {
(*tmpTypeList)[member].type->getQualifier().layoutPacking = qualifier.layoutPacking; (*tmpTypeList)[member].type->getQualifier().layoutPacking = qualifier.layoutPacking;
} }
} }