Skip to content

G
glslang
Commit 54ee28f4 by John Kessenich
Options

HLSL: Add scoping operator, accept static member functions, and support calling them.

parent 5f12d2f7
Showing with 286 additions and 4 deletions
Test/baseResults/hlsl.staticMemberFunction.frag.out 0 → 100755
hlsl.staticMemberFunction.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: Test::staticMemFun(vf4; (global 4-component vector of float)
0:5 Function Parameters:
0:5 'a' (in 4-component vector of float)
0:? Sequence
0:6 Branch: Return with expression
0:6 vector-scale (temp 4-component vector of float)
0:6 Constant:
0:6 2.000000
0:6 'a' (in 4-component vector of float)
0:9 Function Definition: Test::staticMemFun(i1; (global int)
0:9 Function Parameters:
0:9 'a' (in int)
0:? Sequence
0:10 Branch: Return with expression
0:10 add (temp int)
0:10 Constant:
0:10 2 (const int)
0:10 'a' (in int)
0:16 Function Definition: @main( (temp 4-component vector of float)
0:16 Function Parameters:
0:? Sequence
0:18 Sequence
0:18 move second child to first child (temp 4-component vector of float)
0:18 'f4' (temp 4-component vector of float)
0:? Constant:
0:? 1.000000
0:? 1.000000
0:? 1.000000
0:? 1.000000
0:19 add second child into first child (temp 4-component vector of float)
0:19 'f4' (temp 4-component vector of float)
0:19 Function Call: Test::staticMemFun(vf4; (global 4-component vector of float)
0:? Constant:
0:? 5.000000
0:? 5.000000
0:? 5.000000
0:? 5.000000
0:20 add second child into first child (temp 4-component vector of float)
0:20 'f4' (temp 4-component vector of float)
0:20 Convert int to float (temp float)
0:20 Function Call: Test::staticMemFun(i1; (global int)
0:20 Constant:
0:20 7 (const int)
0:21 Branch: Return with expression
0:21 'f4' (temp 4-component vector of float)
0:16 Function Definition: main( (temp void)
0:16 Function Parameters:
0:? Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:16 Function Call: @main( (temp 4-component vector of float)
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: Test::staticMemFun(vf4; (global 4-component vector of float)
0:5 Function Parameters:
0:5 'a' (in 4-component vector of float)
0:? Sequence
0:6 Branch: Return with expression
0:6 vector-scale (temp 4-component vector of float)
0:6 Constant:
0:6 2.000000
0:6 'a' (in 4-component vector of float)
0:9 Function Definition: Test::staticMemFun(i1; (global int)
0:9 Function Parameters:
0:9 'a' (in int)
0:? Sequence
0:10 Branch: Return with expression
0:10 add (temp int)
0:10 Constant:
0:10 2 (const int)
0:10 'a' (in int)
0:16 Function Definition: @main( (temp 4-component vector of float)
0:16 Function Parameters:
0:? Sequence
0:18 Sequence
0:18 move second child to first child (temp 4-component vector of float)
0:18 'f4' (temp 4-component vector of float)
0:? Constant:
0:? 1.000000
0:? 1.000000
0:? 1.000000
0:? 1.000000
0:19 add second child into first child (temp 4-component vector of float)
0:19 'f4' (temp 4-component vector of float)
0:19 Function Call: Test::staticMemFun(vf4; (global 4-component vector of float)
0:? Constant:
0:? 5.000000
0:? 5.000000
0:? 5.000000
0:? 5.000000
0:20 add second child into first child (temp 4-component vector of float)
0:20 'f4' (temp 4-component vector of float)
0:20 Convert int to float (temp float)
0:20 Function Call: Test::staticMemFun(i1; (global int)
0:20 Constant:
0:20 7 (const int)
0:21 Branch: Return with expression
0:21 'f4' (temp 4-component vector of float)
0:16 Function Definition: main( (temp void)
0:16 Function Parameters:
0:? Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:16 Function Call: @main( (temp 4-component vector of float)
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 54
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 52
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 11 "Test::staticMemFun(vf4;"
Name 10 "a"
Name 17 "Test::staticMemFun(i1;"
Name 16 "a"
Name 20 "@main("
Name 32 "f4"
Name 37 "param"
Name 42 "param"
Name 52 "@entryPointOutput"
Decorate 52(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
9: TypeFunction 7(fvec4) 8(ptr)
13: TypeInt 32 1
14: TypePointer Function 13(int)
15: TypeFunction 13(int) 14(ptr)
19: TypeFunction 7(fvec4)
22: 6(float) Constant 1073741824
27: 13(int) Constant 2
33: 6(float) Constant 1065353216
34: 7(fvec4) ConstantComposite 33 33 33 33
35: 6(float) Constant 1084227584
36: 7(fvec4) ConstantComposite 35 35 35 35
41: 13(int) Constant 7
51: TypePointer Output 7(fvec4)
52(@entryPointOutput): 51(ptr) Variable Output
4(main): 2 Function None 3
5: Label
53: 7(fvec4) FunctionCall 20(@main()
Store 52(@entryPointOutput) 53
Return
FunctionEnd
11(Test::staticMemFun(vf4;): 7(fvec4) Function None 9
10(a): 8(ptr) FunctionParameter
12: Label
23: 7(fvec4) Load 10(a)
24: 7(fvec4) VectorTimesScalar 23 22
ReturnValue 24
FunctionEnd
17(Test::staticMemFun(i1;): 13(int) Function None 15
16(a): 14(ptr) FunctionParameter
18: Label
28: 13(int) Load 16(a)
29: 13(int) IAdd 27 28
ReturnValue 29
FunctionEnd
20(@main(): 7(fvec4) Function None 19
21: Label
32(f4): 8(ptr) Variable Function
37(param): 8(ptr) Variable Function
42(param): 14(ptr) Variable Function
Store 32(f4) 34
Store 37(param) 36
38: 7(fvec4) FunctionCall 11(Test::staticMemFun(vf4;) 37(param)
39: 7(fvec4) Load 32(f4)
40: 7(fvec4) FAdd 39 38
Store 32(f4) 40
Store 42(param) 41
43: 13(int) FunctionCall 17(Test::staticMemFun(i1;) 42(param)
44: 6(float) ConvertSToF 43
45: 7(fvec4) Load 32(f4)
46: 7(fvec4) CompositeConstruct 44 44 44 44
47: 7(fvec4) FAdd 45 46
Store 32(f4) 47
48: 7(fvec4) Load 32(f4)
ReturnValue 48
FunctionEnd
Test/hlsl.staticMemberFunction.frag 0 → 100755
struct Test
{
float4 memVar;
static float4 staticMemFun(float4 a) : SV_Position
{
return 2 * a;
}
static int staticMemFun(int a) : SV_Position
{
return 2 + a;
}
int i;
};
float4 main() : SV_Target0
{
Test test;
float4 f4 = float4(1.0,1.0,1.0,1.0);
f4 += Test::staticMemFun(float4(5.0f,5.0f,5.0f,5.0f));
f4 += Test::staticMemFun(7);
return f4;
}
glslang/Include/intermediate.h
......@@ -183,6 +183,7 @@ enum TOperator {
EOpVectorSwizzle,
EOpMethod,
EOpScoping,
//
// Built-in functions mapped to operators
......
gtests/Hlsl.FromFile.cpp
......@@ -212,6 +212,7 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.semicolons.frag", "main"},
{"hlsl.shapeConv.frag", "main"},
{"hlsl.shapeConvRet.frag", "main"},
{"hlsl.staticMemberFunction.frag", "main"},
{"hlsl.stringtoken.frag", "main"},
{"hlsl.string.frag", "main"},
{"hlsl.struct.split-1.vert", "main"},
......
hlsl/hlslGrammar.h
......@@ -69,9 +69,11 @@ namespace glslang {
bool acceptSamplerDeclarationDX9(TType&);
bool acceptSamplerState();
bool acceptFullySpecifiedType(TType&);
bool acceptFullySpecifiedType(TType&, TIntermNode*& nodeList);
bool acceptQualifier(TQualifier&);
bool acceptLayoutQualifierList(TQualifier&);
bool acceptType(TType&);
bool acceptType(TType&, TIntermNode*& nodeList);
bool acceptTemplateVecMatBasicType(TBasicType&);
bool acceptVectorTemplateType(TType&);
bool acceptMatrixTemplateType(TType&);
......@@ -83,8 +85,10 @@ namespace glslang {
bool acceptSamplerType(TType&);
bool acceptTextureType(TType&);
bool acceptStructBufferType(TType&);
bool acceptStruct(TType&);
bool acceptStructDeclarationList(TTypeList*&);
bool acceptStruct(TType&, TIntermNode*& nodeList);
bool acceptStructDeclarationList(TTypeList*&, TIntermNode*& nodeList, const TString& typeName);
bool acceptMemberFunctionDefinition(TIntermNode*& nodeList, const TString& typeName,
const TType&, const TString& memberName);
bool acceptFunctionParameters(TFunction&);
bool acceptParameterDeclaration(TFunction&);
bool acceptFunctionDefinition(TFunction&, TIntermNode*& nodeList, const TAttributeMap&);
......@@ -97,7 +101,8 @@ namespace glslang {
bool acceptUnaryExpression(TIntermTyped*&);
bool acceptPostfixExpression(TIntermTyped*&);
bool acceptConstructor(TIntermTyped*&);
bool acceptFunctionCall(HlslToken, TIntermTyped*&, TIntermTyped* base = nullptr);
bool acceptFunctionCall(HlslToken, TIntermTyped*&, TIntermTyped* objectBase = nullptr,
const TSymbol* typeBase = nullptr);
bool acceptArguments(TFunction*, TIntermTyped*&);
bool acceptLiteral(TIntermTyped*&);
bool acceptCompoundStatement(TIntermNode*&);
......
hlsl/hlslOpMap.cpp
......@@ -118,6 +118,8 @@ TOperator HlslOpMap::postUnary(EHlslTokenClass op)
case EHTokIncOp: return EOpPostIncrement;
case EHTokDecOp: return EOpPostDecrement;
case EHTokColonColon: return EOpScoping;
default: return EOpNull; // means not a post-unary op
}
}
......
hlsl/hlslParseHelper.cpp
......@@ -958,6 +958,9 @@ TIntermTyped* HlslParseContext::handleDotDereference(const TSourceLoc& loc, TInt
//
bool HlslParseContext::isBuiltInMethod(const TSourceLoc& loc, TIntermTyped* base, const TString& field)
{
if (base == nullptr)
return false;
variableCheck(base);
if (base->getType().getBasicType() == EbtSampler) {
......@@ -7086,6 +7089,49 @@ TIntermNode* HlslParseContext::addSwitch(const TSourceLoc& loc, TIntermTyped* ex
return switchNode;
}
// Track levels of class/struct nesting with a prefix string using
// the type names separated by the scoping operator. E.g., two levels
// would look like:
//
// outer::inner
//
// The string is empty when at normal global level.
//
void HlslParseContext::pushThis(const TString& typeName)
{
// make new type prefix
TString newPrefix;
if (currentTypePrefix.size() > 0) {
newPrefix = currentTypePrefix.back();
newPrefix.append("::");
}
newPrefix.append(typeName);
currentTypePrefix.push_back(newPrefix);
}
// Opposite of pushThis(), see above
void HlslParseContext::popThis()
{
currentTypePrefix.pop_back();
}
// Use the class/struct nesting string to create a global name for
// a member of a class/struct. Static members use "::" for the final
// step, while non-static members use ".".
TString* HlslParseContext::getFullMemberFunctionName(const TString& memberName, bool isStatic) const
{
TString* name = NewPoolTString("");
if (currentTypePrefix.size() > 0)
name->append(currentTypePrefix.back());
if (isStatic)
name->append("::");
else
name->append(".");
name->append(memberName);
return name;
}
// Potentially rename shader entry point function
void HlslParseContext::renameShaderFunction(TString*& name) const
{
......
hlsl/hlslParseHelper.h
......@@ -160,6 +160,10 @@ public:
void pushScope() { symbolTable.push(); }
void popScope() { symbolTable.pop(0); }
void pushThis(const TString& name);
void popThis();
TString* getFullMemberFunctionName(const TString& name, bool isStatic) const;
void pushSwitchSequence(TIntermSequence* sequence) { switchSequenceStack.push_back(sequence); }
void popSwitchSequence() { switchSequenceStack.pop_back(); }
......@@ -382,6 +386,7 @@ protected:
TString patchConstantFunctionName; // hull shader patch constant function name, from function level attribute.
TMap<TBuiltInVariable, TSymbol*> builtInLinkageSymbols; // used for tessellation, finding declared builtins
TVector<TString> currentTypePrefix;
};
} // end namespace glslang
......
hlsl/hlslScanContext.cpp
......@@ -552,6 +552,8 @@ EHlslTokenClass HlslScanContext::tokenizeClass(HlslToken& token)
case PpAtomDecrement: return EHTokDecOp;
case PpAtomIncrement: return EHTokIncOp;
case PpAtomColonColon: return EHTokColonColon;
case PpAtomConstInt: parserToken->i = ppToken.ival; return EHTokIntConstant;
case PpAtomConstUint: parserToken->i = ppToken.ival; return EHTokUintConstant;
case PpAtomConstFloat: parserToken->d = ppToken.dval; return EHTokFloatConstant;
......
hlsl/hlslTokens.h
......@@ -267,7 +267,6 @@ enum EHlslTokenClass {
// variable, user type, ...
EHTokIdentifier,
EHTokTypeName,
EHTokClass,
EHTokStruct,
EHTokCBuffer,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment