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

Merge pull request #1687 from Igalia/apinheiro/no-more-struct-member-offsets

Browse Source 
ParseHelper: don't assign xfb_offset for struct members
This commit is contained in:
John Kessenich 2019-02-03 23:22:21 +07:00 committed by GitHub
commit 9983f99e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Test/baseResults/spv.xfbOffsetOnStructMembersAssignment.vert.out
View File

@ -27,16 +27,14 @@ spv.xfbOffsetOnStructMembersAssignment.vert
Name 34 "" Name 34 ""
Name 38 "gl_VertexID" Name 38 "gl_VertexID"
Name 39 "gl_InstanceID" Name 39 "gl_InstanceID"
MemberDecorate 7(S) 0 Offset 16
MemberDecorate 7(S) 1 Offset 20
Decorate 9(s1) Location 0 Decorate 9(s1) Location 0
Decorate 9(s1) XfbBuffer 2 Decorate 9(s1) XfbBuffer 2
Decorate 9(s1) XfbStride 24 Decorate 9(s1) XfbStride 24
MemberDecorate 19(S2) 0 Offset 8 Decorate 9(s1) Offset 16
MemberDecorate 19(S2) 1 Offset 12
Decorate 21(s2) Location 5 Decorate 21(s2) Location 5
Decorate 21(s2) XfbBuffer 1 Decorate 21(s2) XfbBuffer 1
Decorate 21(s2) XfbStride 28 Decorate 21(s2) XfbStride 28
Decorate 21(s2) Offset 8
MemberDecorate 32(gl_PerVertex) 0 BuiltIn Position MemberDecorate 32(gl_PerVertex) 0 BuiltIn Position
MemberDecorate 32(gl_PerVertex) 1 BuiltIn PointSize MemberDecorate 32(gl_PerVertex) 1 BuiltIn PointSize
MemberDecorate 32(gl_PerVertex) 2 BuiltIn ClipDistance MemberDecorate 32(gl_PerVertex) 2 BuiltIn ClipDistance

5
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -6244,11 +6244,6 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
// fix up // fix up
fixOffset(loc, *symbol); fixOffset(loc, *symbol);
if (symbol->getType().getBasicType() == EbtStruct) {
fixXfbOffsets(symbol->getWritableType().getQualifier(),
*(symbol->getWritableType().getWritableStruct()));
}
return initNode; return initNode;
} }