diff --git a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
index c288bd1b343b933c299b677f56280b8c23a1524c..e3d74b5a1f90b4e267b33f768fb9b9d0c786eb11 100644
--- a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
+++ b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
@@ -1,46 +1,50 @@
hlsl.aliasOpaque.frag
+WARNING: AST will form illegal SPIR-V; need to transform to legalize
// Module Version 10000
// Generated by (magic number): 80001
-// Id's are bound by 61
+// Id's are bound by 81
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint Fragment 4 "main" 46
+ EntryPoint Fragment 4 "main" 57
ExecutionMode 4 OriginUpperLeft
Source HLSL 500
Name 4 "main"
- Name 36 "gss"
- Name 37 "gtex"
- Name 46 "@entryPointOutput"
- Decorate 36(gss) DescriptorSet 0
- Decorate 37(gtex) DescriptorSet 0
- Decorate 46(@entryPointOutput) Location 0
+ Name 37 "gss2"
+ Name 39 "gss"
+ Name 43 "gtex"
+ Name 57 "@entryPointOutput"
+ Decorate 37(gss2) DescriptorSet 0
+ Decorate 39(gss) DescriptorSet 0
+ Decorate 43(gtex) DescriptorSet 0
+ Decorate 57(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeSampler
- 7: TypePointer UniformConstant 6
8: TypeFloat 32
10: TypeImage 8(float) 2D sampled format:Unknown
- 11: TypePointer UniformConstant 10
12: TypeVector 8(float) 4
25: TypeSampledImage 10
27: TypeVector 8(float) 2
28: 8(float) Constant 1045220557
29: 8(float) Constant 1050253722
30: 27(fvec2) ConstantComposite 28 29
- 36(gss): 7(ptr) Variable UniformConstant
- 37(gtex): 11(ptr) Variable UniformConstant
- 39: 8(float) Constant 1077936128
- 45: TypePointer Output 12(fvec4)
-46(@entryPointOutput): 45(ptr) Variable Output
+ 36: TypePointer UniformConstant 6
+ 37(gss2): 36(ptr) Variable UniformConstant
+ 39(gss): 36(ptr) Variable UniformConstant
+ 42: TypePointer UniformConstant 10
+ 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
5: Label
- 56: 10 Load 37(gtex)
- 57: 6 Load 36(gss)
- 58: 25 SampledImage 56 57
- 59: 12(fvec4) ImageSampleImplicitLod 58 30
- 60: 12(fvec4) VectorTimesScalar 59 39
- Store 46(@entryPointOutput) 60
+ 68: 6 Load 39(gss)
+ 69: 10 Load 43(gtex)
+ 78: 25 SampledImage 69 68
+ 79: 12(fvec4) ImageSampleImplicitLod 78 30
+ 80: 12(fvec4) VectorTimesScalar 79 46
+ Store 57(@entryPointOutput) 80
Return
FunctionEnd
diff --git a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
index eddb07c3ad7a03a4b8804a7b2c4950ac7cc202fe..3b0b2e2e568be1a163c06cdd5b5fa45f571c6790 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
@@ -1,65 +1,65 @@
hlsl.flattenOpaque.frag
// Module Version 10000
// Generated by (magic number): 80001
-// Id's are bound by 118
+// Id's are bound by 144
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint Fragment 4 "main" 83
+ EntryPoint Fragment 4 "main" 97
ExecutionMode 4 OriginUpperLeft
Source HLSL 500
Name 4 "main"
- Name 37 "tex"
- Name 68 "s.s2D"
- Name 73 "s2.s2D"
- Name 74 "s2.tex"
- Name 83 "@entryPointOutput"
- Decorate 37(tex) DescriptorSet 0
- Decorate 68(s.s2D) DescriptorSet 0
- Decorate 73(s2.s2D) DescriptorSet 0
- Decorate 74(s2.tex) DescriptorSet 0
- Decorate 83(@entryPointOutput) Location 0
+ Name 38 "tex"
+ Name 70 "s.s2D"
+ Name 79 "s2.s2D"
+ Name 80 "s2.tex"
+ Name 97 "@entryPointOutput"
+ Decorate 38(tex) DescriptorSet 0
+ Decorate 70(s.s2D) DescriptorSet 0
+ Decorate 79(s2.s2D) DescriptorSet 0
+ Decorate 80(s2.tex) DescriptorSet 0
+ Decorate 97(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeSampler
- 7: TypePointer UniformConstant 6
8: TypeFloat 32
9: TypeVector 8(float) 4
14: TypeVector 8(float) 2
21: TypeImage 8(float) 2D sampled format:Unknown
- 22: TypePointer UniformConstant 21
- 37(tex): 22(ptr) Variable UniformConstant
- 40: TypeSampledImage 21
- 42: 8(float) Constant 1045220557
- 43: 8(float) Constant 1050253722
- 44: 14(fvec2) ConstantComposite 42 43
- 68(s.s2D): 7(ptr) Variable UniformConstant
- 73(s2.s2D): 7(ptr) Variable UniformConstant
- 74(s2.tex): 22(ptr) Variable UniformConstant
- 82: TypePointer Output 9(fvec4)
-83(@entryPointOutput): 82(ptr) Variable Output
+ 37: TypePointer UniformConstant 21
+ 38(tex): 37(ptr) Variable UniformConstant
+ 41: TypeSampledImage 21
+ 43: 8(float) Constant 1045220557
+ 44: 8(float) Constant 1050253722
+ 45: 14(fvec2) ConstantComposite 43 44
+ 69: TypePointer UniformConstant 6
+ 70(s.s2D): 69(ptr) Variable UniformConstant
+ 79(s2.s2D): 69(ptr) Variable UniformConstant
+ 80(s2.tex): 37(ptr) Variable UniformConstant
+ 96: TypePointer Output 9(fvec4)
+97(@entryPointOutput): 96(ptr) Variable Output
4(main): 2 Function None 3
5: Label
- 97: 21 Load 37(tex)
- 98: 6 Load 68(s.s2D)
- 99: 40 SampledImage 97 98
- 100: 9(fvec4) ImageSampleImplicitLod 99 44
- 102: 21 Load 37(tex)
- 103: 6 Load 68(s.s2D)
- 104: 40 SampledImage 102 103
- 106: 9(fvec4) ImageSampleImplicitLod 104 44
- 91: 9(fvec4) FAdd 100 106
- 108: 21 Load 74(s2.tex)
- 109: 6 Load 73(s2.s2D)
- 110: 40 SampledImage 108 109
- 111: 9(fvec4) ImageSampleImplicitLod 110 44
- 93: 9(fvec4) FAdd 91 111
- 113: 21 Load 74(s2.tex)
- 114: 6 Load 73(s2.s2D)
- 115: 40 SampledImage 113 114
- 117: 9(fvec4) ImageSampleImplicitLod 115 44
- 95: 9(fvec4) FAdd 93 117
- Store 83(@entryPointOutput) 95
+ 109: 6 Load 70(s.s2D)
+ 123: 21 Load 38(tex)
+ 125: 41 SampledImage 123 109
+ 126: 9(fvec4) ImageSampleImplicitLod 125 45
+ 111: 6 Load 70(s.s2D)
+ 128: 21 Load 38(tex)
+ 130: 41 SampledImage 128 111
+ 132: 9(fvec4) ImageSampleImplicitLod 130 45
+ 113: 9(fvec4) FAdd 126 132
+ 114: 6 Load 79(s2.s2D)
+ 115: 21 Load 80(s2.tex)
+ 136: 41 SampledImage 115 114
+ 137: 9(fvec4) ImageSampleImplicitLod 136 45
+ 117: 9(fvec4) FAdd 113 137
+ 118: 6 Load 79(s2.s2D)
+ 119: 21 Load 80(s2.tex)
+ 141: 41 SampledImage 119 118
+ 143: 9(fvec4) ImageSampleImplicitLod 141 45
+ 121: 9(fvec4) FAdd 117 143
+ Store 97(@entryPointOutput) 121
Return
FunctionEnd
diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
index da7c3ab0cf1e82b05c8f5e045975e305628d5ee6..21a960b58cbd15319ba68fbf060488a82c6caeb2 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
@@ -1,36 +1,29 @@
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
// Generated by (magic number): 80001
-// Id's are bound by 76
+// Id's are bound by 117
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint Vertex 4 "main" 58
+ EntryPoint Vertex 4 "main" 78
Source HLSL 500
Name 4 "main"
Name 17 "FxaaTex"
MemberName 17(FxaaTex) 0 "smpl"
MemberName 17(FxaaTex) 1 "tex"
- Name 36 "g_tInputTexture_sampler"
- 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
+ Name 38 "g_tInputTexture_sampler"
+ Name 42 "g_tInputTexture"
+ Name 78 "@entryPointOutput"
+ Decorate 38(g_tInputTexture_sampler) DescriptorSet 0
+ Decorate 42(g_tInputTexture) DescriptorSet 0
+ Decorate 78(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeSampler
- 7: TypePointer UniformConstant 6
8: TypeFloat 32
9: TypeImage 8(float) 2D sampled format:Unknown
- 10: TypePointer UniformConstant 9
11: TypeVector 8(float) 4
17(FxaaTex): TypeStruct 6 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
31: 28(fvec2) ConstantComposite 29 30
32: 8(float) Constant 0
-36(g_tInputTexture_sampler): 7(ptr) Variable UniformConstant
-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
+ 37: TypePointer UniformConstant 6
+38(g_tInputTexture_sampler): 37(ptr) Variable UniformConstant
+ 41: TypePointer UniformConstant 9
+42(g_tInputTexture): 41(ptr) Variable UniformConstant
+ 77: TypePointer Output 11(fvec4)
+78(@entryPointOutput): 77(ptr) Variable Output
4(main): 2 Function None 3
5: Label
- 70: 17(FxaaTex) Load 39(t)
- Store 43(flattenTemp) 70
- 63: 7(ptr) AccessChain 43(flattenTemp) 47
- 64: 6 Load 63
- Store 45(tex2.smpl) 64
- 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
+ 90: 6 Load 38(g_tInputTexture_sampler)
+ 91: 9 Load 42(g_tInputTexture)
+ 115: 26 SampledImage 91 90
+ 116: 11(fvec4) ImageSampleExplicitLod 115 31 Lod 32
+ Store 78(@entryPointOutput) 116
Return
FunctionEnd
diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
index 101c0366d6c4933ba0ab1b3f6c37273cb1049395..80e3e670cf644d2ba5216848e76bc80fba666ff5 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
@@ -1,43 +1,49 @@
hlsl.flattenOpaqueInitMix.vert
+WARNING: AST will form illegal SPIR-V; need to transform to legalize
// Module Version 10000
// Generated by (magic number): 80001
-// Id's are bound by 60
+// Id's are bound by 100
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint Vertex 4 "main" 44
+ EntryPoint Vertex 4 "main" 68
Source HLSL 500
Name 4 "main"
- Name 36 "g_tInputTexture_sampler"
- Name 37 "g_tInputTexture"
- Name 44 "@entryPointOutput"
- Decorate 36(g_tInputTexture_sampler) DescriptorSet 0
- Decorate 37(g_tInputTexture) DescriptorSet 0
- Decorate 44(@entryPointOutput) Location 0
+ Name 34 "FxaaTex"
+ MemberName 34(FxaaTex) 0 "smpl"
+ MemberName 34(FxaaTex) 1 "tex"
+ MemberName 34(FxaaTex) 2 "f"
+ Name 38 "g_tInputTexture_sampler"
+ 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
3: TypeFunction 2
6: TypeSampler
- 7: TypePointer UniformConstant 6
8: TypeFloat 32
9: TypeImage 8(float) 2D sampled format:Unknown
- 10: TypePointer UniformConstant 9
12: TypeVector 8(float) 4
24: TypeSampledImage 9
28: TypeVector 8(float) 2
30: 8(float) Constant 0
- 35: 8(float) Constant 1056964608
-36(g_tInputTexture_sampler): 7(ptr) Variable UniformConstant
-37(g_tInputTexture): 10(ptr) Variable UniformConstant
- 43: TypePointer Output 12(fvec4)
-44(@entryPointOutput): 43(ptr) Variable Output
+ 34(FxaaTex): TypeStruct 6 9 8(float)
+ 37: TypePointer UniformConstant 6
+38(g_tInputTexture_sampler): 37(ptr) Variable UniformConstant
+ 40: TypePointer UniformConstant 9
+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
5: Label
- 53: 9 Load 37(g_tInputTexture)
- 54: 6 Load 36(g_tInputTexture_sampler)
- 55: 24 SampledImage 53 54
- 58: 28(fvec2) CompositeConstruct 35 35
- 59: 12(fvec4) ImageSampleExplicitLod 55 58 Lod 30
- Store 44(@entryPointOutput) 59
+ 79: 6 Load 38(g_tInputTexture_sampler)
+ 80: 9 Load 41(g_tInputTexture)
+ 95: 24 SampledImage 80 79
+ 98: 28(fvec2) CompositeConstruct 43 43
+ 99: 12(fvec4) ImageSampleExplicitLod 95 98 Lod 30
+ Store 68(@entryPointOutput) 99
Return
FunctionEnd