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

Legalization: Fix tests after workarounds removed

Browse Source
This commit is contained in:
GregF 2017-09-29 10:08:20 -06:00
parent d41993d9d2
commit 354a54c67d
4 changed files with 116 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Test/baseLegalResults/hlsl.aliasOpaque.frag.out
View File

@ -1,46 +1,50 @@
hlsl.aliasOpaque.frag hlsl.aliasOpaque.frag
WARNING: AST will form illegal SPIR-V; need to transform to legalize
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 61 // Id's are bound by 81
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 46 EntryPoint Fragment 4 "main" 57
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
Name 36 "gss" Name 37 "gss2"
Name 37 "gtex" Name 39 "gss"
Name 46 "@entryPointOutput" Name 43 "gtex"
Decorate 36(gss) DescriptorSet 0 Name 57 "@entryPointOutput"
Decorate 37(gtex) DescriptorSet 0 Decorate 37(gss2) DescriptorSet 0
Decorate 46(@entryPointOutput) Location 0 Decorate 39(gss) DescriptorSet 0
Decorate 43(gtex) DescriptorSet 0
Decorate 57(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeSampler 6: TypeSampler
7: TypePointer UniformConstant 6
8: TypeFloat 32 8: TypeFloat 32
10: TypeImage 8(float) 2D sampled format:Unknown 10: TypeImage 8(float) 2D sampled format:Unknown
11: TypePointer UniformConstant 10
12: TypeVector 8(float) 4 12: TypeVector 8(float) 4
25: TypeSampledImage 10 25: TypeSampledImage 10
27: TypeVector 8(float) 2 27: TypeVector 8(float) 2
28: 8(float) Constant 1045220557 28: 8(float) Constant 1045220557
29: 8(float) Constant 1050253722 29: 8(float) Constant 1050253722
30: 27(fvec2) ConstantComposite 28 29 30: 27(fvec2) ConstantComposite 28 29
36(gss): 7(ptr) Variable UniformConstant 36: TypePointer UniformConstant 6
37(gtex): 11(ptr) Variable UniformConstant 37(gss2): 36(ptr) Variable UniformConstant
39: 8(float) Constant 1077936128 39(gss): 36(ptr) Variable UniformConstant
45: TypePointer Output 12(fvec4) 42: TypePointer UniformConstant 10
46(@entryPointOutput): 45(ptr) Variable Output 43(gtex): 42(ptr) Variable UniformConstant
46: 8(float) Constant 1077936128
56: TypePointer Output 12(fvec4)
57(@entryPointOutput): 56(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
56: 10 Load 37(gtex) 68: 6 Load 39(gss)
57: 6 Load 36(gss) 69: 10 Load 43(gtex)
58: 25 SampledImage 56 57 78: 25 SampledImage 69 68
59: 12(fvec4) ImageSampleImplicitLod 58 30 79: 12(fvec4) ImageSampleImplicitLod 78 30
60: 12(fvec4) VectorTimesScalar 59 39 80: 12(fvec4) VectorTimesScalar 79 46
Store 46(@entryPointOutput) 60 Store 57(@entryPointOutput) 80
Return Return
FunctionEnd FunctionEnd

88
Test/baseLegalResults/hlsl.flattenOpaque.frag.out
View File

@ -1,65 +1,65 @@
hlsl.flattenOpaque.frag hlsl.flattenOpaque.frag
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 118 // Id's are bound by 144
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 83 EntryPoint Fragment 4 "main" 97
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
Name 37 "tex" Name 38 "tex"
Name 68 "s.s2D" Name 70 "s.s2D"
Name 73 "s2.s2D" Name 79 "s2.s2D"
Name 74 "s2.tex" Name 80 "s2.tex"
Name 83 "@entryPointOutput" Name 97 "@entryPointOutput"
Decorate 37(tex) DescriptorSet 0 Decorate 38(tex) DescriptorSet 0
Decorate 68(s.s2D) DescriptorSet 0 Decorate 70(s.s2D) DescriptorSet 0
Decorate 73(s2.s2D) DescriptorSet 0 Decorate 79(s2.s2D) DescriptorSet 0
Decorate 74(s2.tex) DescriptorSet 0 Decorate 80(s2.tex) DescriptorSet 0
Decorate 83(@entryPointOutput) Location 0 Decorate 97(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeSampler 6: TypeSampler
7: TypePointer UniformConstant 6
8: TypeFloat 32 8: TypeFloat 32
9: TypeVector 8(float) 4 9: TypeVector 8(float) 4
14: TypeVector 8(float) 2 14: TypeVector 8(float) 2
21: TypeImage 8(float) 2D sampled format:Unknown 21: TypeImage 8(float) 2D sampled format:Unknown
22: TypePointer UniformConstant 21 37: TypePointer UniformConstant 21
37(tex): 22(ptr) Variable UniformConstant 38(tex): 37(ptr) Variable UniformConstant
40: TypeSampledImage 21 41: TypeSampledImage 21
42: 8(float) Constant 1045220557 43: 8(float) Constant 1045220557
43: 8(float) Constant 1050253722 44: 8(float) Constant 1050253722
44: 14(fvec2) ConstantComposite 42 43 45: 14(fvec2) ConstantComposite 43 44
68(s.s2D): 7(ptr) Variable UniformConstant 69: TypePointer UniformConstant 6
73(s2.s2D): 7(ptr) Variable UniformConstant 70(s.s2D): 69(ptr) Variable UniformConstant
74(s2.tex): 22(ptr) Variable UniformConstant 79(s2.s2D): 69(ptr) Variable UniformConstant
82: TypePointer Output 9(fvec4) 80(s2.tex): 37(ptr) Variable UniformConstant
83(@entryPointOutput): 82(ptr) Variable Output 96: TypePointer Output 9(fvec4)
97(@entryPointOutput): 96(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
97: 21 Load 37(tex) 109: 6 Load 70(s.s2D)
98: 6 Load 68(s.s2D) 123: 21 Load 38(tex)
99: 40 SampledImage 97 98 125: 41 SampledImage 123 109
100: 9(fvec4) ImageSampleImplicitLod 99 44 126: 9(fvec4) ImageSampleImplicitLod 125 45
102: 21 Load 37(tex) 111: 6 Load 70(s.s2D)
103: 6 Load 68(s.s2D) 128: 21 Load 38(tex)
104: 40 SampledImage 102 103 130: 41 SampledImage 128 111
106: 9(fvec4) ImageSampleImplicitLod 104 44 132: 9(fvec4) ImageSampleImplicitLod 130 45
91: 9(fvec4) FAdd 100 106 113: 9(fvec4) FAdd 126 132
108: 21 Load 74(s2.tex) 114: 6 Load 79(s2.s2D)
109: 6 Load 73(s2.s2D) 115: 21 Load 80(s2.tex)
110: 40 SampledImage 108 109 136: 41 SampledImage 115 114
111: 9(fvec4) ImageSampleImplicitLod 110 44 137: 9(fvec4) ImageSampleImplicitLod 136 45
93: 9(fvec4) FAdd 91 111 117: 9(fvec4) FAdd 113 137
113: 21 Load 74(s2.tex) 118: 6 Load 79(s2.s2D)
114: 6 Load 73(s2.s2D) 119: 21 Load 80(s2.tex)
115: 40 SampledImage 113 114 141: 41 SampledImage 119 118
117: 9(fvec4) ImageSampleImplicitLod 115 44 143: 9(fvec4) ImageSampleImplicitLod 141 45
95: 9(fvec4) FAdd 93 117 121: 9(fvec4) FAdd 117 143
Store 83(@entryPointOutput) 95 Store 97(@entryPointOutput) 121
Return Return
FunctionEnd FunctionEnd

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

@ -1,36 +1,29 @@
hlsl.flattenOpaqueInit.vert hlsl.flattenOpaqueInit.vert
WARNING: 0:20: '=' : cannot do member-wise aliasing for opaque members with this initializer WARNING: AST will form illegal SPIR-V; need to transform to legalize
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 76 // Id's are bound by 117
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 58 EntryPoint Vertex 4 "main" 78
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
Name 17 "FxaaTex" Name 17 "FxaaTex"
MemberName 17(FxaaTex) 0 "smpl" MemberName 17(FxaaTex) 0 "smpl"
MemberName 17(FxaaTex) 1 "tex" MemberName 17(FxaaTex) 1 "tex"
Name 36 "g_tInputTexture_sampler" Name 38 "g_tInputTexture_sampler"
Name 37 "g_tInputTexture" Name 42 "g_tInputTexture"
Name 39 "t" Name 78 "@entryPointOutput"
Name 43 "flattenTemp" Decorate 38(g_tInputTexture_sampler) DescriptorSet 0
Name 45 "tex2.smpl" Decorate 42(g_tInputTexture) DescriptorSet 0
Name 50 "tex2.tex" Decorate 78(@entryPointOutput) Location 0
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
7: TypePointer UniformConstant 6
8: TypeFloat 32 8: TypeFloat 32
9: TypeImage 8(float) 2D sampled format:Unknown 9: TypeImage 8(float) 2D sampled format:Unknown
10: TypePointer UniformConstant 9
11: TypeVector 8(float) 4 11: TypeVector 8(float) 4
17(FxaaTex): TypeStruct 6 9 17(FxaaTex): TypeStruct 6 9
26: TypeSampledImage 9 26: TypeSampledImage 9
@ -39,32 +32,18 @@ WARNING: 0:20: '=' : cannot do member-wise aliasing for opaque members with this
30: 8(float) Constant 1053609165 30: 8(float) Constant 1053609165
31: 28(fvec2) ConstantComposite 29 30 31: 28(fvec2) ConstantComposite 29 30
32: 8(float) Constant 0 32: 8(float) Constant 0
36(g_tInputTexture_sampler): 7(ptr) Variable UniformConstant 37: TypePointer UniformConstant 6
37(g_tInputTexture): 10(ptr) Variable UniformConstant 38(g_tInputTexture_sampler): 37(ptr) Variable UniformConstant
38: TypePointer UniformConstant 17(FxaaTex) 41: TypePointer UniformConstant 9
39(t): 38(ptr) Variable UniformConstant 42(g_tInputTexture): 41(ptr) Variable UniformConstant
43(flattenTemp): 38(ptr) Variable UniformConstant 77: TypePointer Output 11(fvec4)
45(tex2.smpl): 7(ptr) Variable UniformConstant 78(@entryPointOutput): 77(ptr) Variable Output
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
70: 17(FxaaTex) Load 39(t) 90: 6 Load 38(g_tInputTexture_sampler)
Store 43(flattenTemp) 70 91: 9 Load 42(g_tInputTexture)
63: 7(ptr) AccessChain 43(flattenTemp) 47 115: 26 SampledImage 91 90
64: 6 Load 63 116: 11(fvec4) ImageSampleExplicitLod 115 31 Lod 32
Store 45(tex2.smpl) 64 Store 78(@entryPointOutput) 116
65: 10(ptr) AccessChain 43(flattenTemp) 51
66: 9 Load 65
Store 50(tex2.tex) 66
72: 9 Load 37(g_tInputTexture)
73: 6 Load 36(g_tInputTexture_sampler)
74: 26 SampledImage 72 73
75: 11(fvec4) ImageSampleExplicitLod 74 31 Lod 32
Store 58(@entryPointOutput) 75
Return Return
FunctionEnd FunctionEnd

48
Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
View File

@ -1,43 +1,49 @@
hlsl.flattenOpaqueInitMix.vert hlsl.flattenOpaqueInitMix.vert
WARNING: AST will form illegal SPIR-V; need to transform to legalize
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 60 // Id's are bound by 100
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 44 EntryPoint Vertex 4 "main" 68
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
Name 36 "g_tInputTexture_sampler" Name 34 "FxaaTex"
Name 37 "g_tInputTexture" MemberName 34(FxaaTex) 0 "smpl"
Name 44 "@entryPointOutput" MemberName 34(FxaaTex) 1 "tex"
Decorate 36(g_tInputTexture_sampler) DescriptorSet 0 MemberName 34(FxaaTex) 2 "f"
Decorate 37(g_tInputTexture) DescriptorSet 0 Name 38 "g_tInputTexture_sampler"
Decorate 44(@entryPointOutput) Location 0 Name 41 "g_tInputTexture"
Name 68 "@entryPointOutput"
Decorate 38(g_tInputTexture_sampler) DescriptorSet 0
Decorate 41(g_tInputTexture) DescriptorSet 0
Decorate 68(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeSampler 6: TypeSampler
7: TypePointer UniformConstant 6
8: TypeFloat 32 8: TypeFloat 32
9: TypeImage 8(float) 2D sampled format:Unknown 9: TypeImage 8(float) 2D sampled format:Unknown
10: TypePointer UniformConstant 9
12: TypeVector 8(float) 4 12: TypeVector 8(float) 4
24: TypeSampledImage 9 24: TypeSampledImage 9
28: TypeVector 8(float) 2 28: TypeVector 8(float) 2
30: 8(float) Constant 0 30: 8(float) Constant 0
35: 8(float) Constant 1056964608 34(FxaaTex): TypeStruct 6 9 8(float)
36(g_tInputTexture_sampler): 7(ptr) Variable UniformConstant 37: TypePointer UniformConstant 6
37(g_tInputTexture): 10(ptr) Variable UniformConstant 38(g_tInputTexture_sampler): 37(ptr) Variable UniformConstant
43: TypePointer Output 12(fvec4) 40: TypePointer UniformConstant 9
44(@entryPointOutput): 43(ptr) Variable Output 41(g_tInputTexture): 40(ptr) Variable UniformConstant
43: 8(float) Constant 1056964608
67: TypePointer Output 12(fvec4)
68(@entryPointOutput): 67(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
53: 9 Load 37(g_tInputTexture) 79: 6 Load 38(g_tInputTexture_sampler)
54: 6 Load 36(g_tInputTexture_sampler) 80: 9 Load 41(g_tInputTexture)
55: 24 SampledImage 53 54 95: 24 SampledImage 80 79
58: 28(fvec2) CompositeConstruct 35 35 98: 28(fvec2) CompositeConstruct 43 43
59: 12(fvec4) ImageSampleExplicitLod 55 58 Lod 30 99: 12(fvec4) ImageSampleExplicitLod 95 98 Lod 30
Store 44(@entryPointOutput) 59 Store 68(@entryPointOutput) 99
Return Return
FunctionEnd FunctionEnd