Skip to content

G
glslang
Commit 03e63fa8 by John Kessenich
Options

HLSL: Add fall-back for opaque initializers to just generate long-term expected code.

This generated code needs an optimization pass to eliminate the assignments to the opaque members.
parent 25495fdf
Showing with 151 additions and 54 deletions
Test/baseResults/hlsl.flattenOpaqueInit.vert.out
hlsl.flattenOpaqueInit.vert hlsl.flattenOpaqueInit.vert
WARNING: 0:20: '=' : cannot do member-wise aliasing for opaque members with this initializer
Shader version: 500 Shader version: 500
0:? Sequence 0:? Sequence
0:5 Function Definition: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float) 0:5 Function Definition: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
...@@ -14,19 +16,43 @@ Shader version: 500 ...@@ -14,19 +16,43 @@ Shader version: 500
0:? Constant: 0:? Constant:
0:? 0.300000 0:? 0.300000
0:? 0.400000 0:? 0.400000
0:10 Function Definition: @main( ( temp 4-component vector of float) 0:10 Function Definition: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex})
0:10 Function Parameters: 0:10 Function Parameters:
0:? Sequence 0:? Sequence
0:12 Branch: Return with expression 0:12 'g_tInputTexture_sampler' ( uniform sampler)
0:12 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float) 0:13 'g_tInputTexture' ( uniform texture2D)
0:14 Branch: Return with expression
0:14 't' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:18 Function Definition: @main( ( temp 4-component vector of float)
0:18 Function Parameters:
0:? Sequence
0:20 Sequence
0:20 Sequence
0:20 move second child to first child ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 Function Call: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 move second child to first child ( temp sampler)
0:? 'tex2.smpl' ( temp sampler)
0:20 smpl: direct index for structure ( temp sampler)
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 Constant:
0:20 0 (const int)
0:20 move second child to first child ( temp texture2D)
0:? 'tex2.tex' ( temp texture2D)
0:20 tex: direct index for structure ( temp texture2D)
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 Constant:
0:20 1 (const int)
0:21 Branch: Return with expression
0:21 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:? 'g_tInputTexture_sampler' ( uniform sampler) 0:? 'g_tInputTexture_sampler' ( uniform sampler)
0:? 'g_tInputTexture' ( uniform texture2D) 0:? 'g_tInputTexture' ( uniform texture2D)
0:10 Function Definition: main( ( temp void) 0:18 Function Definition: main( ( temp void)
0:10 Function Parameters: 0:18 Function Parameters:
0:? Sequence 0:? Sequence
0:10 move second child to first child ( temp 4-component vector of float) 0:18 move second child to first child ( temp 4-component vector of float)
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
0:10 Function Call: @main( ( temp 4-component vector of float) 0:18 Function Call: @main( ( temp 4-component vector of float)
0:? Linker Objects 0:? Linker Objects
0:? 'g_tInputTexture_sampler' ( uniform sampler) 0:? 'g_tInputTexture_sampler' ( uniform sampler)
0:? 'g_tInputTexture' ( uniform texture2D) 0:? 'g_tInputTexture' ( uniform texture2D)
...@@ -51,19 +77,43 @@ Shader version: 500 ...@@ -51,19 +77,43 @@ Shader version: 500
0:? Constant: 0:? Constant:
0:? 0.300000 0:? 0.300000
0:? 0.400000 0:? 0.400000
0:10 Function Definition: @main( ( temp 4-component vector of float) 0:10 Function Definition: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex})
0:10 Function Parameters: 0:10 Function Parameters:
0:? Sequence 0:? Sequence
0:12 Branch: Return with expression 0:12 'g_tInputTexture_sampler' ( uniform sampler)
0:12 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float) 0:13 'g_tInputTexture' ( uniform texture2D)
0:14 Branch: Return with expression
0:14 't' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:18 Function Definition: @main( ( temp 4-component vector of float)
0:18 Function Parameters:
0:? Sequence
0:20 Sequence
0:20 Sequence
0:20 move second child to first child ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 Function Call: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 move second child to first child ( temp sampler)
0:? 'tex2.smpl' ( temp sampler)
0:20 smpl: direct index for structure ( temp sampler)
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 Constant:
0:20 0 (const int)
0:20 move second child to first child ( temp texture2D)
0:? 'tex2.tex' ( temp texture2D)
0:20 tex: direct index for structure ( temp texture2D)
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:20 Constant:
0:20 1 (const int)
0:21 Branch: Return with expression
0:21 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:? 'g_tInputTexture_sampler' ( uniform sampler) 0:? 'g_tInputTexture_sampler' ( uniform sampler)
0:? 'g_tInputTexture' ( uniform texture2D) 0:? 'g_tInputTexture' ( uniform texture2D)
0:10 Function Definition: main( ( temp void) 0:18 Function Definition: main( ( temp void)
0:10 Function Parameters: 0:18 Function Parameters:
0:? Sequence 0:? Sequence
0:10 move second child to first child ( temp 4-component vector of float) 0:18 move second child to first child ( temp 4-component vector of float)
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
0:10 Function Call: @main( ( temp 4-component vector of float) 0:18 Function Call: @main( ( temp 4-component vector of float)
0:? Linker Objects 0:? Linker Objects
0:? 'g_tInputTexture_sampler' ( uniform sampler) 0:? 'g_tInputTexture_sampler' ( uniform sampler)
0:? 'g_tInputTexture' ( uniform texture2D) 0:? 'g_tInputTexture' ( uniform texture2D)
...@@ -71,24 +121,32 @@ Shader version: 500 ...@@ -71,24 +121,32 @@ Shader version: 500
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 40 // Id's are bound by 60
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 38 EntryPoint Vertex 4 "main" 58
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
Name 15 "lookUp(struct-FxaaTex-p1-t211;" Name 15 "lookUp(struct-FxaaTex-p1-t211;"
Name 13 "tex.smpl" Name 13 "tex.smpl"
Name 14 "tex.tex" Name 14 "tex.tex"
Name 18 "@main(" Name 17 "FxaaTex"
Name 32 "g_tInputTexture_sampler" MemberName 17(FxaaTex) 0 "smpl"
Name 33 "g_tInputTexture" MemberName 17(FxaaTex) 1 "tex"
Name 38 "@entryPointOutput" Name 19 "fillOpaque("
Decorate 32(g_tInputTexture_sampler) DescriptorSet 0 Name 22 "@main("
Decorate 33(g_tInputTexture) DescriptorSet 0 Name 36 "g_tInputTexture_sampler"
Decorate 38(@entryPointOutput) Location 0 Name 37 "g_tInputTexture"
Name 39 "t"
Name 43 "flattenTemp"
Name 45 "tex2.smpl"
Name 50 "tex2.tex"
Name 58 "@entryPointOutput"
Decorate 36(g_tInputTexture_sampler) DescriptorSet 0
Decorate 37(g_tInputTexture) DescriptorSet 0
Decorate 58(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeSampler 6: TypeSampler
...@@ -98,35 +156,58 @@ Shader version: 500 ...@@ -98,35 +156,58 @@ Shader version: 500
10: TypePointer UniformConstant 9 10: TypePointer UniformConstant 9
11: TypeVector 8(float) 4 11: TypeVector 8(float) 4
12: TypeFunction 11(fvec4) 7(ptr) 10(ptr) 12: TypeFunction 11(fvec4) 7(ptr) 10(ptr)
17: TypeFunction 11(fvec4) 17(FxaaTex): TypeStruct 6 9
22: TypeSampledImage 9 18: TypeFunction 17(FxaaTex)
24: TypeVector 8(float) 2 21: TypeFunction 11(fvec4)
25: 8(float) Constant 1050253722 26: TypeSampledImage 9
26: 8(float) Constant 1053609165 28: TypeVector 8(float) 2
27: 24(fvec2) ConstantComposite 25 26 29: 8(float) Constant 1050253722
28: 8(float) Constant 0 30: 8(float) Constant 1053609165
32(g_tInputTexture_sampler): 7(ptr) Variable UniformConstant 31: 28(fvec2) ConstantComposite 29 30
33(g_tInputTexture): 10(ptr) Variable UniformConstant 32: 8(float) Constant 0
37: TypePointer Output 11(fvec4) 36(g_tInputTexture_sampler): 7(ptr) Variable UniformConstant
38(@entryPointOutput): 37(ptr) Variable Output 37(g_tInputTexture): 10(ptr) Variable UniformConstant
38: TypePointer UniformConstant 17(FxaaTex)
39(t): 38(ptr) Variable UniformConstant
43(flattenTemp): 38(ptr) Variable UniformConstant
45(tex2.smpl): 7(ptr) Variable UniformConstant
46: TypeInt 32 1
47: 46(int) Constant 0
50(tex2.tex): 10(ptr) Variable UniformConstant
51: 46(int) Constant 1
57: TypePointer Output 11(fvec4)
58(@entryPointOutput): 57(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
39: 11(fvec4) FunctionCall 18(@main() 59: 11(fvec4) FunctionCall 22(@main()
Store 38(@entryPointOutput) 39 Store 58(@entryPointOutput) 59
Return Return
FunctionEnd FunctionEnd
15(lookUp(struct-FxaaTex-p1-t211;): 11(fvec4) Function None 12 15(lookUp(struct-FxaaTex-p1-t211;): 11(fvec4) Function None 12
13(tex.smpl): 7(ptr) FunctionParameter 13(tex.smpl): 7(ptr) FunctionParameter
14(tex.tex): 10(ptr) FunctionParameter 14(tex.tex): 10(ptr) FunctionParameter
16: Label 16: Label
20: 9 Load 14(tex.tex) 24: 9 Load 14(tex.tex)
21: 6 Load 13(tex.smpl) 25: 6 Load 13(tex.smpl)
23: 22 SampledImage 20 21 27: 26 SampledImage 24 25
29: 11(fvec4) ImageSampleExplicitLod 23 27 Lod 28 33: 11(fvec4) ImageSampleExplicitLod 27 31 Lod 32
ReturnValue 29 ReturnValue 33
FunctionEnd
19(fillOpaque(): 17(FxaaTex) Function None 18
20: Label
40: 17(FxaaTex) Load 39(t)
ReturnValue 40
FunctionEnd FunctionEnd
18(@main(): 11(fvec4) Function None 17 22(@main(): 11(fvec4) Function None 21
19: Label 23: Label
34: 11(fvec4) FunctionCall 15(lookUp(struct-FxaaTex-p1-t211;) 32(g_tInputTexture_sampler) 33(g_tInputTexture) 44: 17(FxaaTex) FunctionCall 19(fillOpaque()
ReturnValue 34 Store 43(flattenTemp) 44
48: 7(ptr) AccessChain 43(flattenTemp) 47
49: 6 Load 48
Store 45(tex2.smpl) 49
52: 10(ptr) AccessChain 43(flattenTemp) 51
53: 9 Load 52
Store 50(tex2.tex) 53
54: 11(fvec4) FunctionCall 15(lookUp(struct-FxaaTex-p1-t211;) 36(g_tInputTexture_sampler) 37(g_tInputTexture)
ReturnValue 54
FunctionEnd FunctionEnd
Test/hlsl.flattenOpaqueInit.vert
...@@ -6,8 +6,17 @@ float4 lookUp(FxaaTex tex) ...@@ -6,8 +6,17 @@ float4 lookUp(FxaaTex tex)
return tex.tex.Sample(tex.smpl, float2(0.3, 0.4)); return tex.tex.Sample(tex.smpl, float2(0.3, 0.4));
} }
FxaaTex fillOpaque()
{
FxaaTex t;
t.smpl = g_tInputTexture_sampler;
t.tex = g_tInputTexture;
return t;
}
float4 main() : SV_TARGET0 float4 main() : SV_TARGET0
{ {
FxaaTex tex = { g_tInputTexture_sampler, g_tInputTexture }; FxaaTex tex1 = { g_tInputTexture_sampler, g_tInputTexture };
return lookUp(tex); FxaaTex tex2 = fillOpaque();
return lookUp(tex1);
} }
\ No newline at end of file
hlsl/hlslParseHelper.cpp
...@@ -2416,17 +2416,23 @@ TIntermAggregate* HlslParseContext::assignClipCullDistance(const TSourceLoc& loc ...@@ -2416,17 +2416,23 @@ TIntermAggregate* HlslParseContext::assignClipCullDistance(const TSourceLoc& loc
// and possibly contains opaque values, such that the initializer should never exist // and possibly contains opaque values, such that the initializer should never exist
// as emitted code, because even creating the initializer would write opaques. // as emitted code, because even creating the initializer would write opaques.
// //
// Decompose this into individual member-wise assignments, which themselves are // If possible, decompose this into individual member-wise assignments, which themselves
// expected to then not exist for opaque types, because they will turn into aliases. // are expected to then not exist for opaque types, because they will turn into aliases.
// //
// Return a node that contains the non-aliased assignments that must continue to exist. // Return a node that contains the non-aliased assignments that must continue to exist.
TIntermAggregate* HlslParseContext::executeFlattenedInitializer(const TSourceLoc& loc, TIntermSymbol* symbol, TIntermTyped* HlslParseContext::executeFlattenedInitializer(const TSourceLoc& loc, TIntermSymbol* symbol,
const TIntermAggregate& initializer) TIntermAggregate& initializer)
{ {
// We need individual RHS initializers per member to do this
const TTypeList* typeList = symbol->getType().getStruct();
if (typeList == nullptr || initializer.getSequence().size() != typeList->size()) {
warn(loc, "cannot do member-wise aliasing for opaque members with this initializer", "=", "");
return handleAssign(loc, EOpAssign, symbol, &initializer);
}
TIntermAggregate* initList = nullptr; TIntermAggregate* initList = nullptr;
// synthesize an access to each member, and then an assignment to it // synthesize an access to each member, and then an assignment to it
const TTypeList& typeList = *symbol->getType().getStruct(); for (int member = 0; member < (int)typeList->size(); ++member) {
for (int member = 0; member < (int)typeList.size(); ++member) {
TIntermTyped* memberInitializer = initializer.getSequence()[member]->getAsTyped(); TIntermTyped* memberInitializer = initializer.getSequence()[member]->getAsTyped();
TIntermTyped* flattenedMember = flattenAccess(symbol, member); TIntermTyped* flattenedMember = flattenAccess(symbol, member);
if (flattenedMember->getType().containsOpaque()) if (flattenedMember->getType().containsOpaque())
......
hlsl/hlslParseHelper.h
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
void remapNonEntryPointIO(TFunction& function); void remapNonEntryPointIO(TFunction& function);
TIntermNode* handleReturnValue(const TSourceLoc&, TIntermTyped*); TIntermNode* handleReturnValue(const TSourceLoc&, TIntermTyped*);
void handleFunctionArgument(TFunction*, TIntermTyped*& arguments, TIntermTyped* newArg); void handleFunctionArgument(TFunction*, TIntermTyped*& arguments, TIntermTyped* newArg);
TIntermAggregate* executeFlattenedInitializer(const TSourceLoc&, TIntermSymbol*, const TIntermAggregate&); TIntermTyped* executeFlattenedInitializer(const TSourceLoc&, TIntermSymbol*, TIntermAggregate&);
TIntermTyped* handleAssign(const TSourceLoc&, TOperator, TIntermTyped* left, TIntermTyped* right); TIntermTyped* handleAssign(const TSourceLoc&, TOperator, TIntermTyped* left, TIntermTyped* right);
TIntermTyped* handleAssignToMatrixSwizzle(const TSourceLoc&, TOperator, TIntermTyped* left, TIntermTyped* right); TIntermTyped* handleAssignToMatrixSwizzle(const TSourceLoc&, TOperator, TIntermTyped* left, TIntermTyped* right);
TIntermTyped* handleFunctionCall(const TSourceLoc&, TFunction*, TIntermTyped*); TIntermTyped* handleFunctionCall(const TSourceLoc&, TFunction*, TIntermTyped*);
......
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