AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-09-19 12:19:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for pragma STDGL invariant(all)

Browse Source 
Fixes #2689
This commit is contained in:
Greg Fischer 2021-07-29 14:58:10 -06:00
parent 4b7b86d568
commit 715f5c6cf1
7 changed files with 111 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Test/baseResults/spv.invariantAll.vert.out Normal file
View File

@ -0,0 +1,55 @@
spv.invariantAll.vert
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 25
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 13 17
Source GLSL 450
Name 4 "main"
Name 11 "gl_PerVertex"
MemberName 11(gl_PerVertex) 0 "gl_Position"
MemberName 11(gl_PerVertex) 1 "gl_PointSize"
MemberName 11(gl_PerVertex) 2 "gl_ClipDistance"
MemberName 11(gl_PerVertex) 3 "gl_CullDistance"
Name 13 ""
Name 17 "v"
MemberDecorate 11(gl_PerVertex) 0 Invariant
MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
MemberDecorate 11(gl_PerVertex) 1 Invariant
MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
MemberDecorate 11(gl_PerVertex) 2 Invariant
MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
MemberDecorate 11(gl_PerVertex) 3 Invariant
MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
Decorate 11(gl_PerVertex) Block
Decorate 17(v) Location 0
Decorate 17(v) Invariant
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypeInt 32 0
9: 8(int) Constant 1
10: TypeArray 6(float) 9
11(gl_PerVertex): TypeStruct 7(fvec4) 6(float) 10 10
12: TypePointer Output 11(gl_PerVertex)
13: 12(ptr) Variable Output
14: TypeInt 32 1
15: 14(int) Constant 0
16: TypePointer Output 6(float)
17(v): 16(ptr) Variable Output
20: 6(float) Constant 0
21: 6(float) Constant 1065353216
23: TypePointer Output 7(fvec4)
4(main): 2 Function None 3
5: Label
18: 6(float) Load 17(v)
19: 6(float) Load 17(v)
22: 7(fvec4) CompositeConstruct 18 19 20 21
24: 23(ptr) AccessChain 13 15
Store 24 22
Return
FunctionEnd

10
Test/spv.invariantAll.vert Normal file
View File

@ -0,0 +1,10 @@
#version 450 core
#pragma STDGL invariant(all)
layout(location=0) out highp float v;
void main()
{
gl_Position = vec4(v, v, 0, 1);
}

39
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -327,6 +327,16 @@ void TParseContext::setAtomicCounterBlockDefaults(TType& block) const
block.getQualifier().layoutMatrix = ElmRowMajor;
}
void TParseContext::setInvariant(const TSourceLoc& loc, const char* builtin) {
TSymbol* symbol = symbolTable.find(builtin);
if (symbol && symbol->getType().getQualifier().isPipeOutput()) {
if (intermediate.inIoAccessed(builtin))
warn(loc, "changing qualification after use", "invariant", builtin);
TSymbol* csymbol = symbolTable.copyUp(symbol);
csymbol->getWritableType().getQualifier().invariant = true;
}
}
void TParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString>& tokens)
{
#ifndef GLSLANG_WEB
@ -404,8 +414,33 @@ void TParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString>&
intermediate.setUseVariablePointers();
} else if (tokens[0].compare("once") == 0) {
warn(loc, "not implemented", "#pragma once", "");
} else if (tokens[0].compare("glslang_binary_double_output") == 0)
} else if (tokens[0].compare("glslang_binary_double_output") == 0) {
intermediate.setBinaryDoubleOutput();
} else if (spvVersion.spv > 0 && tokens[0].compare("STDGL") == 0 &&
tokens[1].compare("invariant") == 0 && tokens[3].compare("all") == 0) {
intermediate.setInvariantAll();
// Set all builtin out variables invariant if declared
setInvariant(loc, "gl_Position");
setInvariant(loc, "gl_PointSize");
setInvariant(loc, "gl_ClipDistance");
setInvariant(loc, "gl_CullDistance");
setInvariant(loc, "gl_TessLevelOuter");
setInvariant(loc, "gl_TessLevelInner");
setInvariant(loc, "gl_PrimitiveID");
setInvariant(loc, "gl_Layer");
setInvariant(loc, "gl_ViewportIndex");
setInvariant(loc, "gl_FragDepth");
setInvariant(loc, "gl_SampleMask");
setInvariant(loc, "gl_ClipVertex");
setInvariant(loc, "gl_FrontColor");
setInvariant(loc, "gl_BackColor");
setInvariant(loc, "gl_FrontSecondaryColor");
setInvariant(loc, "gl_BackSecondaryColor");
setInvariant(loc, "gl_TexCoord");
setInvariant(loc, "gl_FogFragCoord");
setInvariant(loc, "gl_FragColor");
setInvariant(loc, "gl_FragData");
}
#endif
}
@ -3651,6 +3686,8 @@ void TParseContext::globalQualifierFixCheck(const TSourceLoc& loc, TQualifier& q
profileRequires(loc, ENoProfile, 130, nullptr, "out for stage outputs");
profileRequires(loc, EEsProfile, 300, nullptr, "out for stage outputs");
qualifier.storage = EvqVaryingOut;
if (intermediate.isInvariantAll())
qualifier.invariant = true;
break;
case EvqInOut:
qualifier.storage = EvqVaryingIn;

2
glslang/MachineIndependent/ParseHelper.h
View File

@ -241,6 +241,7 @@ protected:
// override this to set the language-specific name
virtual const char* getAtomicCounterBlockName() const { return ""; }
virtual void setAtomicCounterBlockDefaults(TType&) const {}
virtual void setInvariant(const TSourceLoc& loc, const char* builtin) {}
virtual void finalizeAtomicCounterBlockLayout(TVariable&) {}
bool isAtomicCounterBlock(const TSymbol& symbol) {
const TVariable* var = symbol.getAsVariable();
@ -511,6 +512,7 @@ protected:
virtual const char* getAtomicCounterBlockName() const override;
virtual void finalizeAtomicCounterBlockLayout(TVariable&) override;
virtual void setAtomicCounterBlockDefaults(TType& block) const override;
virtual void setInvariant(const TSourceLoc& loc, const char* builtin) override;
public:
//

1
glslang/MachineIndependent/linkValidate.cpp
View File

@ -316,6 +316,7 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
MERGE_TRUE(useUnknownFormat);
MERGE_TRUE(hlslOffsets);
MERGE_TRUE(useStorageBuffer);
MERGE_TRUE(invariantAll);
MERGE_TRUE(hlslIoMapping);
// TODO: sourceFile

4
glslang/MachineIndependent/localintermediate.h
View File

@ -291,6 +291,7 @@ public:
numEntryPoints(0), numErrors(0), numPushConstants(0), recursive(false),
invertY(false),
useStorageBuffer(false),
invariantAll(false),
nanMinMaxClamp(false),
depthReplacing(false),
uniqueId(0),
@ -560,6 +561,8 @@ public:
void setUseStorageBuffer() { useStorageBuffer = true; }
bool usingStorageBuffer() const { return useStorageBuffer; }
void setInvariantAll() { invariantAll = true; }
bool isInvariantAll() const { return invariantAll; }
void setDepthReplacing() { depthReplacing = true; }
bool isDepthReplacing() const { return depthReplacing; }
bool setLocalSize(int dim, int size)
@ -1063,6 +1066,7 @@ protected:
bool recursive;
bool invertY;
bool useStorageBuffer;
bool invariantAll;
bool nanMinMaxClamp; // true if desiring min/max/clamp to favor non-NaN over NaN
bool depthReplacing;
int localSize[3];

1
gtests/Spv.FromFile.cpp
View File

@ -363,6 +363,7 @@ INSTANTIATE_TEST_SUITE_P(
"spv.intrinsicsSpirvLiteral.vert",
"spv.intrinsicsSpirvStorageClass.rchit",
"spv.intrinsicsSpirvType.rgen",
"spv.invariantAll.vert",
"spv.layer.tese",
"spv.layoutNested.vert",
"spv.length.frag",