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

Tests: Trigger more texture tests, and hopefully see build failure go away.

Browse Source 
(This is motivated by wanting to retickle the tests.)
This commit is contained in:
John Kessenich
2017-11-28 23:47:08 -07:00
parent 1ce94b2d68
commit ffc31cdc5c
3 changed files with 159 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
View File

@@ -2,12 +2,12 @@ hlsl.flattenOpaqueInit.vert
WARNING: AST will form illegal SPIR-V; need to transform to legalize WARNING: AST will form illegal SPIR-V; need to transform to legalize
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80002 // Generated by (magic number): 80002
// Id's are bound by 125 // Id's are bound by 176
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 82 EntryPoint Vertex 4 "main" 99
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
Name 17 "FxaaTex" Name 17 "FxaaTex"
@@ -15,10 +15,10 @@ WARNING: AST will form illegal SPIR-V; need to transform to legalize
MemberName 17(FxaaTex) 1 "tex" MemberName 17(FxaaTex) 1 "tex"
Name 38 "g_tInputTexture_sampler" Name 38 "g_tInputTexture_sampler"
Name 42 "g_tInputTexture" Name 42 "g_tInputTexture"
Name 82 "@entryPointOutput" Name 99 "@entryPointOutput"
Decorate 38(g_tInputTexture_sampler) DescriptorSet 0 Decorate 38(g_tInputTexture_sampler) DescriptorSet 0
Decorate 42(g_tInputTexture) DescriptorSet 0 Decorate 42(g_tInputTexture) DescriptorSet 0
Decorate 82(@entryPointOutput) Location 0 Decorate 99(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeSampler 6: TypeSampler
@@ -36,14 +36,23 @@ WARNING: AST will form illegal SPIR-V; need to transform to legalize
38(g_tInputTexture_sampler): 37(ptr) Variable UniformConstant 38(g_tInputTexture_sampler): 37(ptr) Variable UniformConstant
41: TypePointer UniformConstant 9 41: TypePointer UniformConstant 9
42(g_tInputTexture): 41(ptr) Variable UniformConstant 42(g_tInputTexture): 41(ptr) Variable UniformConstant
81: TypePointer Output 11(fvec4) 98: TypePointer Output 11(fvec4)
82(@entryPointOutput): 81(ptr) Variable Output 99(@entryPointOutput): 98(ptr) Variable Output
175: 17(FxaaTex) Undef
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
96: 6 Load 38(g_tInputTexture_sampler) 117: 6 Load 38(g_tInputTexture_sampler)
97: 9 Load 42(g_tInputTexture) 118: 9 Load 42(g_tInputTexture)
123: 26 SampledImage 97 96 148: 26 SampledImage 118 117
124: 11(fvec4) ImageSampleExplicitLod 123 31 Lod 32 149: 11(fvec4) ImageSampleExplicitLod 148 31 Lod 32
Store 82(@entryPointOutput) 124 172: 6 CompositeExtract 175 0
174: 9 CompositeExtract 175 1
160: 26 SampledImage 174 172
161: 11(fvec4) ImageSampleExplicitLod 160 31 Lod 32
136: 11(fvec4) FAdd 149 161
165: 26 SampledImage 118 117
166: 11(fvec4) ImageSampleExplicitLod 165 31 Lod 32
143: 11(fvec4) FAdd 136 166
Store 99(@entryPointOutput) 143
Return Return
FunctionEnd FunctionEnd

213
Test/baseResults/hlsl.flattenOpaqueInit.vert.out
View File

@@ -49,34 +49,48 @@ Shader version: 500
0:19 Constant: 0:19 Constant:
0:19 1 (const int) 0:19 1 (const int)
0:20 Sequence 0:20 Sequence
0:20 Sequence 0:20 move second child to first child ( temp 4-component vector of float)
0:20 move second child to first child ( temp structure{ temp sampler smpl, temp texture2D tex}) 0:20 'res' ( temp 4-component vector of float)
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex}) 0:20 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:20 Function Call: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex}) 0:? 'tex1.smpl' ( temp sampler)
0:20 move second child to first child ( temp sampler) 0:? 'tex1.tex' ( temp texture2D)
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 Sequence 0:21 Sequence
0:21 Sequence 0:21 Sequence
0:21 move second child to first child ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 Function Call: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 move second child to first child ( temp sampler) 0:21 move second child to first child ( temp sampler)
0:? 'tex2.smpl' ( temp sampler)
0:21 smpl: direct index for structure ( temp sampler)
0:21 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 Constant:
0:21 0 (const int)
0:21 move second child to first child ( temp texture2D)
0:? 'tex2.tex' ( temp texture2D)
0:21 tex: direct index for structure ( temp texture2D)
0:21 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 Constant:
0:21 1 (const int)
0:22 add second child into first child ( temp 4-component vector of float)
0:22 'res' ( temp 4-component vector of float)
0:22 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:? 'tex2.smpl' ( temp sampler)
0:? 'tex2.tex' ( temp texture2D)
0:23 Sequence
0:23 Sequence
0:23 move second child to first child ( temp sampler)
0:? 'tex3.smpl' ( temp sampler) 0:? 'tex3.smpl' ( temp sampler)
0:? 'tex1.smpl' ( temp sampler) 0:? 'tex1.smpl' ( temp sampler)
0:21 move second child to first child ( temp texture2D) 0:23 move second child to first child ( temp texture2D)
0:? 'tex3.tex' ( temp texture2D) 0:? 'tex3.tex' ( temp texture2D)
0:? 'tex1.tex' ( temp texture2D) 0:? 'tex1.tex' ( temp texture2D)
0:22 Branch: Return with expression 0:24 add second child into first child ( temp 4-component vector of float)
0:22 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float) 0:24 'res' ( temp 4-component vector of float)
0:24 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:? 'tex3.smpl' ( temp sampler) 0:? 'tex3.smpl' ( temp sampler)
0:? 'tex3.tex' ( temp texture2D) 0:? 'tex3.tex' ( temp texture2D)
0:25 Branch: Return with expression
0:25 'res' ( temp 4-component vector of float)
0:18 Function Definition: main( ( temp void) 0:18 Function Definition: main( ( temp void)
0:18 Function Parameters: 0:18 Function Parameters:
0:? Sequence 0:? Sequence
@@ -141,34 +155,48 @@ Shader version: 500
0:19 Constant: 0:19 Constant:
0:19 1 (const int) 0:19 1 (const int)
0:20 Sequence 0:20 Sequence
0:20 Sequence 0:20 move second child to first child ( temp 4-component vector of float)
0:20 move second child to first child ( temp structure{ temp sampler smpl, temp texture2D tex}) 0:20 'res' ( temp 4-component vector of float)
0:20 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex}) 0:20 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:20 Function Call: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex}) 0:? 'tex1.smpl' ( temp sampler)
0:20 move second child to first child ( temp sampler) 0:? 'tex1.tex' ( temp texture2D)
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 Sequence 0:21 Sequence
0:21 Sequence 0:21 Sequence
0:21 move second child to first child ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 Function Call: fillOpaque( ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 move second child to first child ( temp sampler) 0:21 move second child to first child ( temp sampler)
0:? 'tex2.smpl' ( temp sampler)
0:21 smpl: direct index for structure ( temp sampler)
0:21 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 Constant:
0:21 0 (const int)
0:21 move second child to first child ( temp texture2D)
0:? 'tex2.tex' ( temp texture2D)
0:21 tex: direct index for structure ( temp texture2D)
0:21 'flattenTemp' ( temp structure{ temp sampler smpl, temp texture2D tex})
0:21 Constant:
0:21 1 (const int)
0:22 add second child into first child ( temp 4-component vector of float)
0:22 'res' ( temp 4-component vector of float)
0:22 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:? 'tex2.smpl' ( temp sampler)
0:? 'tex2.tex' ( temp texture2D)
0:23 Sequence
0:23 Sequence
0:23 move second child to first child ( temp sampler)
0:? 'tex3.smpl' ( temp sampler) 0:? 'tex3.smpl' ( temp sampler)
0:? 'tex1.smpl' ( temp sampler) 0:? 'tex1.smpl' ( temp sampler)
0:21 move second child to first child ( temp texture2D) 0:23 move second child to first child ( temp texture2D)
0:? 'tex3.tex' ( temp texture2D) 0:? 'tex3.tex' ( temp texture2D)
0:? 'tex1.tex' ( temp texture2D) 0:? 'tex1.tex' ( temp texture2D)
0:22 Branch: Return with expression 0:24 add second child into first child ( temp 4-component vector of float)
0:22 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float) 0:24 'res' ( temp 4-component vector of float)
0:24 Function Call: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float)
0:? 'tex3.smpl' ( temp sampler) 0:? 'tex3.smpl' ( temp sampler)
0:? 'tex3.tex' ( temp texture2D) 0:? 'tex3.tex' ( temp texture2D)
0:25 Branch: Return with expression
0:25 'res' ( temp 4-component vector of float)
0:18 Function Definition: main( ( temp void) 0:18 Function Definition: main( ( temp void)
0:18 Function Parameters: 0:18 Function Parameters:
0:? Sequence 0:? Sequence
@@ -182,12 +210,12 @@ Shader version: 500
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80002 // Generated by (magic number): 80002
// Id's are bound by 84 // Id's are bound by 101
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 82 EntryPoint Vertex 4 "main" 99
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;"
@@ -206,17 +234,22 @@ Shader version: 500
Name 49 "flattenTemp" Name 49 "flattenTemp"
Name 53 "tex1.smpl" Name 53 "tex1.smpl"
Name 58 "tex1.tex" Name 58 "tex1.tex"
Name 62 "flattenTemp" Name 63 "res"
Name 64 "tex2.smpl" Name 64 "param"
Name 67 "tex2.tex" Name 66 "param"
Name 70 "tex3.smpl" Name 69 "flattenTemp"
Name 72 "tex3.tex" Name 71 "tex2.smpl"
Name 74 "param" Name 74 "tex2.tex"
Name 76 "param" Name 77 "param"
Name 82 "@entryPointOutput" Name 79 "param"
Name 84 "tex3.smpl"
Name 86 "tex3.tex"
Name 88 "param"
Name 90 "param"
Name 99 "@entryPointOutput"
Decorate 38(g_tInputTexture_sampler) DescriptorSet 0 Decorate 38(g_tInputTexture_sampler) DescriptorSet 0
Decorate 42(g_tInputTexture) DescriptorSet 0 Decorate 42(g_tInputTexture) DescriptorSet 0
Decorate 82(@entryPointOutput) Location 0 Decorate 99(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeSampler 6: TypeSampler
@@ -243,12 +276,13 @@ Shader version: 500
54: TypeInt 32 1 54: TypeInt 32 1
55: 54(int) Constant 0 55: 54(int) Constant 0
59: 54(int) Constant 1 59: 54(int) Constant 1
81: TypePointer Output 11(fvec4) 62: TypePointer Function 11(fvec4)
82(@entryPointOutput): 81(ptr) Variable Output 98: TypePointer Output 11(fvec4)
99(@entryPointOutput): 98(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
83: 11(fvec4) FunctionCall 22(@main() 100: 11(fvec4) FunctionCall 22(@main()
Store 82(@entryPointOutput) 83 Store 99(@entryPointOutput) 100
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
@@ -278,13 +312,18 @@ Shader version: 500
49(flattenTemp): 44(ptr) Variable Function 49(flattenTemp): 44(ptr) Variable Function
53(tex1.smpl): 7(ptr) Variable Function 53(tex1.smpl): 7(ptr) Variable Function
58(tex1.tex): 10(ptr) Variable Function 58(tex1.tex): 10(ptr) Variable Function
62(flattenTemp): 44(ptr) Variable Function 63(res): 62(ptr) Variable Function
64(tex2.smpl): 7(ptr) Variable Function 64(param): 7(ptr) Variable Function
67(tex2.tex): 10(ptr) Variable Function 66(param): 10(ptr) Variable Function
70(tex3.smpl): 7(ptr) Variable Function 69(flattenTemp): 44(ptr) Variable Function
72(tex3.tex): 10(ptr) Variable Function 71(tex2.smpl): 7(ptr) Variable Function
74(param): 7(ptr) Variable Function 74(tex2.tex): 10(ptr) Variable Function
76(param): 10(ptr) Variable Function 77(param): 7(ptr) Variable Function
79(param): 10(ptr) Variable Function
84(tex3.smpl): 7(ptr) Variable Function
86(tex3.tex): 10(ptr) Variable Function
88(param): 7(ptr) Variable Function
90(param): 10(ptr) Variable Function
50: 6 Load 38(g_tInputTexture_sampler) 50: 6 Load 38(g_tInputTexture_sampler)
51: 9 Load 42(g_tInputTexture) 51: 9 Load 42(g_tInputTexture)
52: 17(FxaaTex) CompositeConstruct 50 51 52: 17(FxaaTex) CompositeConstruct 50 51
@@ -295,22 +334,40 @@ Shader version: 500
60: 10(ptr) AccessChain 49(flattenTemp) 59 60: 10(ptr) AccessChain 49(flattenTemp) 59
61: 9 Load 60 61: 9 Load 60
Store 58(tex1.tex) 61 Store 58(tex1.tex) 61
63: 17(FxaaTex) FunctionCall 19(fillOpaque() 65: 6 Load 53(tex1.smpl)
Store 62(flattenTemp) 63 Store 64(param) 65
65: 7(ptr) AccessChain 62(flattenTemp) 55 67: 9 Load 58(tex1.tex)
66: 6 Load 65 Store 66(param) 67
Store 64(tex2.smpl) 66 68: 11(fvec4) FunctionCall 15(lookUp(struct-FxaaTex-p1-t211;) 64(param) 66(param)
68: 10(ptr) AccessChain 62(flattenTemp) 59 Store 63(res) 68
69: 9 Load 68 70: 17(FxaaTex) FunctionCall 19(fillOpaque()
Store 67(tex2.tex) 69 Store 69(flattenTemp) 70
71: 6 Load 53(tex1.smpl) 72: 7(ptr) AccessChain 69(flattenTemp) 55
Store 70(tex3.smpl) 71 73: 6 Load 72
73: 9 Load 58(tex1.tex) Store 71(tex2.smpl) 73
Store 72(tex3.tex) 73 75: 10(ptr) AccessChain 69(flattenTemp) 59
75: 6 Load 70(tex3.smpl) 76: 9 Load 75
Store 74(param) 75 Store 74(tex2.tex) 76
77: 9 Load 72(tex3.tex) 78: 6 Load 71(tex2.smpl)
Store 76(param) 77 Store 77(param) 78
78: 11(fvec4) FunctionCall 15(lookUp(struct-FxaaTex-p1-t211;) 74(param) 76(param) 80: 9 Load 74(tex2.tex)
ReturnValue 78 Store 79(param) 80
81: 11(fvec4) FunctionCall 15(lookUp(struct-FxaaTex-p1-t211;) 77(param) 79(param)
82: 11(fvec4) Load 63(res)
83: 11(fvec4) FAdd 82 81
Store 63(res) 83
85: 6 Load 53(tex1.smpl)
Store 84(tex3.smpl) 85
87: 9 Load 58(tex1.tex)
Store 86(tex3.tex) 87
89: 6 Load 84(tex3.smpl)
Store 88(param) 89
91: 9 Load 86(tex3.tex)
Store 90(param) 91
92: 11(fvec4) FunctionCall 15(lookUp(struct-FxaaTex-p1-t211;) 88(param) 90(param)
93: 11(fvec4) Load 63(res)
94: 11(fvec4) FAdd 93 92
Store 63(res) 94
95: 11(fvec4) Load 63(res)
ReturnValue 95
FunctionEnd FunctionEnd

5
Test/hlsl.flattenOpaqueInit.vert
View File

@@ -17,7 +17,10 @@ FxaaTex fillOpaque()
float4 main() : SV_TARGET0 float4 main() : SV_TARGET0
{ {
FxaaTex tex1 = { g_tInputTexture_sampler, g_tInputTexture }; FxaaTex tex1 = { g_tInputTexture_sampler, g_tInputTexture };
float4 res = lookUp(tex1);
FxaaTex tex2 = fillOpaque(); FxaaTex tex2 = fillOpaque();
res += lookUp(tex2);
FxaaTex tex3 = tex1; FxaaTex tex3 = tex1;
return lookUp(tex3); res += lookUp(tex3);
return res;
} }