HLSL: Add shape conversions for scalar -> vector assigments.
Also, this allows turning on the error check for a failed assigment when parsing. This makes 39 HLSL tests have a working assignment that was previously silently dropped, due to lack of this functionality.
This commit is contained in:
John Kessenich
parent
a26a5170a3
commit
fea226ba43
46 changed files with 2571 additions and 1413 deletions
|
|
@ -68,6 +68,16 @@ gl_FragCoord origin is upper left
|
|||
0:? 0.700000
|
||||
0:? 0.800000
|
||||
0:? 0.900000
|
||||
0:44 move second child to first child (temp 4-component vector of float)
|
||||
0:44 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:44 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:44 Constant:
|
||||
0:44 0 (const int)
|
||||
0:44 Constant:
|
||||
0:44 1.000000
|
||||
0:44 1.000000
|
||||
0:44 1.000000
|
||||
0:44 1.000000
|
||||
0:45 move second child to first child (temp float)
|
||||
0:45 Depth: direct index for structure (temp float FragDepth)
|
||||
0:45 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
|
|
@ -167,6 +177,16 @@ gl_FragCoord origin is upper left
|
|||
0:? 0.700000
|
||||
0:? 0.800000
|
||||
0:? 0.900000
|
||||
0:44 move second child to first child (temp 4-component vector of float)
|
||||
0:44 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:44 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:44 Constant:
|
||||
0:44 0 (const int)
|
||||
0:44 Constant:
|
||||
0:44 1.000000
|
||||
0:44 1.000000
|
||||
0:44 1.000000
|
||||
0:44 1.000000
|
||||
0:45 move second child to first child (temp float)
|
||||
0:45 Depth: direct index for structure (temp float FragDepth)
|
||||
0:45 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
|
|
@ -195,7 +215,7 @@ gl_FragCoord origin is upper left
|
|||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 119
|
||||
// Id's are bound by 121
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
|
|
@ -222,14 +242,14 @@ gl_FragCoord origin is upper left
|
|||
MemberName 90(PS_OUTPUT) 0 "Color"
|
||||
MemberName 90(PS_OUTPUT) 1 "Depth"
|
||||
Name 92 "psout"
|
||||
Name 99 "g_sSamp2d"
|
||||
Name 102 "g_tTex1df4a"
|
||||
Name 103 "g_tTex1df4"
|
||||
Name 106 "g_tTex1di4"
|
||||
Name 109 "g_tTex1du4"
|
||||
Name 112 "g_tTex3df4"
|
||||
Name 115 "g_tTex3di4"
|
||||
Name 118 "g_tTex3du4"
|
||||
Name 101 "g_sSamp2d"
|
||||
Name 104 "g_tTex1df4a"
|
||||
Name 105 "g_tTex1df4"
|
||||
Name 108 "g_tTex1di4"
|
||||
Name 111 "g_tTex1du4"
|
||||
Name 114 "g_tTex3df4"
|
||||
Name 117 "g_tTex3di4"
|
||||
Name 120 "g_tTex3du4"
|
||||
Decorate 12(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 16(g_sSamp) DescriptorSet 0
|
||||
Decorate 32(g_tTex2di4) DescriptorSet 0
|
||||
|
|
@ -238,14 +258,14 @@ gl_FragCoord origin is upper left
|
|||
Decorate 70(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 80(g_tTexcdu4) DescriptorSet 0
|
||||
MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 99(g_sSamp2d) DescriptorSet 0
|
||||
Decorate 102(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 103(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 106(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 109(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 112(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 115(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 118(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 101(g_sSamp2d) DescriptorSet 0
|
||||
Decorate 104(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 105(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 108(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 111(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 114(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 117(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 120(g_tTex3du4) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
|
|
@ -304,29 +324,30 @@ gl_FragCoord origin is upper left
|
|||
88: 64(fvec3) ConstantComposite 85 86 87
|
||||
90(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
|
||||
91: TypePointer Function 90(PS_OUTPUT)
|
||||
93: 24(int) Constant 1
|
||||
94: 6(float) Constant 1065353216
|
||||
95: TypePointer Function 6(float)
|
||||
99(g_sSamp2d): 15(ptr) Variable UniformConstant
|
||||
100: TypeImage 6(float) 1D sampled format:Unknown
|
||||
101: TypePointer UniformConstant 100
|
||||
102(g_tTex1df4a): 101(ptr) Variable UniformConstant
|
||||
103(g_tTex1df4): 101(ptr) Variable UniformConstant
|
||||
104: TypeImage 24(int) 1D sampled format:Unknown
|
||||
105: TypePointer UniformConstant 104
|
||||
106(g_tTex1di4): 105(ptr) Variable UniformConstant
|
||||
107: TypeImage 41(int) 1D sampled format:Unknown
|
||||
108: TypePointer UniformConstant 107
|
||||
109(g_tTex1du4): 108(ptr) Variable UniformConstant
|
||||
110: TypeImage 6(float) 3D sampled format:Unknown
|
||||
111: TypePointer UniformConstant 110
|
||||
112(g_tTex3df4): 111(ptr) Variable UniformConstant
|
||||
113: TypeImage 24(int) 3D sampled format:Unknown
|
||||
114: TypePointer UniformConstant 113
|
||||
115(g_tTex3di4): 114(ptr) Variable UniformConstant
|
||||
116: TypeImage 41(int) 3D sampled format:Unknown
|
||||
117: TypePointer UniformConstant 116
|
||||
118(g_tTex3du4): 117(ptr) Variable UniformConstant
|
||||
93: 6(float) Constant 1065353216
|
||||
94: 7(fvec4) ConstantComposite 93 93 93 93
|
||||
96: 24(int) Constant 1
|
||||
97: TypePointer Function 6(float)
|
||||
101(g_sSamp2d): 15(ptr) Variable UniformConstant
|
||||
102: TypeImage 6(float) 1D sampled format:Unknown
|
||||
103: TypePointer UniformConstant 102
|
||||
104(g_tTex1df4a): 103(ptr) Variable UniformConstant
|
||||
105(g_tTex1df4): 103(ptr) Variable UniformConstant
|
||||
106: TypeImage 24(int) 1D sampled format:Unknown
|
||||
107: TypePointer UniformConstant 106
|
||||
108(g_tTex1di4): 107(ptr) Variable UniformConstant
|
||||
109: TypeImage 41(int) 1D sampled format:Unknown
|
||||
110: TypePointer UniformConstant 109
|
||||
111(g_tTex1du4): 110(ptr) Variable UniformConstant
|
||||
112: TypeImage 6(float) 3D sampled format:Unknown
|
||||
113: TypePointer UniformConstant 112
|
||||
114(g_tTex3df4): 113(ptr) Variable UniformConstant
|
||||
115: TypeImage 24(int) 3D sampled format:Unknown
|
||||
116: TypePointer UniformConstant 115
|
||||
117(g_tTex3di4): 116(ptr) Variable UniformConstant
|
||||
118: TypeImage 41(int) 3D sampled format:Unknown
|
||||
119: TypePointer UniformConstant 118
|
||||
120(g_tTex3du4): 119(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(txval20): 8(ptr) Variable Function
|
||||
|
|
@ -366,8 +387,10 @@ gl_FragCoord origin is upper left
|
|||
84: 83 SampledImage 81 82
|
||||
89: 42(ivec4) ImageGather 84 88 25
|
||||
Store 77(txval42) 89
|
||||
96: 95(ptr) AccessChain 92(psout) 93
|
||||
Store 96 94
|
||||
97:90(PS_OUTPUT) Load 92(psout)
|
||||
ReturnValue 97
|
||||
95: 8(ptr) AccessChain 92(psout) 25
|
||||
Store 95 94
|
||||
98: 97(ptr) AccessChain 92(psout) 96
|
||||
Store 98 93
|
||||
99:90(PS_OUTPUT) Load 92(psout)
|
||||
ReturnValue 99
|
||||
FunctionEnd
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue