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

HLSL: Emulate write-to-output on return-from-entry-point, for return value.

Browse Source 
This fixes issue #487 and #480.
It also correctly handles output parameters from the entry point.
This commit is contained in:
John Kessenich
2016-08-28 15:00:23 -06:00
parent 81cd764b5f
commit 6a70eb7161
91 changed files with 5158 additions and 4130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Test/baseResults/hlsl.gather.basic.dx10.vert.out
View File

@@ -77,8 +77,11 @@ Shader version: 450
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:45 Branch: Return with expression
0:45 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:45 Sequence
0:45 move second child to first child (temp structure{temp 4-component vector of float FragCoord Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float FragCoord Pos})
0:45 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:45 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_sSamp2d' (uniform sampler)
@@ -178,8 +181,11 @@ Shader version: 450
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:45 Branch: Return with expression
0:45 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:45 Sequence
0:45 move second child to first child (temp structure{temp 4-component vector of float FragCoord Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float FragCoord Pos})
0:45 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos})
0:45 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
0:? 'g_sSamp2d' (uniform sampler)
@@ -199,13 +205,13 @@ Shader version: 450
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 118
// Id's are bound by 120
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main"
EntryPoint Vertex 4 "main" 97
Name 4 "main"
Name 9 "txval20"
Name 12 "g_tTex2df4"
@@ -223,14 +229,15 @@ Shader version: 450
Name 90 "VS_OUTPUT"
MemberName 90(VS_OUTPUT) 0 "Pos"
Name 92 "vsout"
Name 98 "g_sSamp2d"
Name 101 "g_tTex1df4a"
Name 102 "g_tTex1df4"
Name 105 "g_tTex1di4"
Name 108 "g_tTex1du4"
Name 111 "g_tTex3df4"
Name 114 "g_tTex3di4"
Name 117 "g_tTex3du4"
Name 97 "@entryPointOutput"
Name 100 "g_sSamp2d"
Name 103 "g_tTex1df4a"
Name 104 "g_tTex1df4"
Name 107 "g_tTex1di4"
Name 110 "g_tTex1du4"
Name 113 "g_tTex3df4"
Name 116 "g_tTex3di4"
Name 119 "g_tTex3du4"
Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0
@@ -240,16 +247,16 @@ Shader version: 450
Decorate 70(g_tTexcdi4) DescriptorSet 0
Decorate 80(g_tTexcdu4) DescriptorSet 0
MemberDecorate 90(VS_OUTPUT) 0 BuiltIn FragCoord
Decorate 98(g_sSamp2d) DescriptorSet 0
Decorate 101(g_tTex1df4a) DescriptorSet 0
Decorate 101(g_tTex1df4a) Binding 1
Decorate 102(g_tTex1df4) DescriptorSet 0
Decorate 102(g_tTex1df4) Binding 0
Decorate 105(g_tTex1di4) DescriptorSet 0
Decorate 108(g_tTex1du4) DescriptorSet 0
Decorate 111(g_tTex3df4) DescriptorSet 0
Decorate 114(g_tTex3di4) DescriptorSet 0
Decorate 117(g_tTex3du4) DescriptorSet 0
Decorate 100(g_sSamp2d) DescriptorSet 0
Decorate 103(g_tTex1df4a) DescriptorSet 0
Decorate 103(g_tTex1df4a) Binding 1
Decorate 104(g_tTex1df4) DescriptorSet 0
Decorate 104(g_tTex1df4) Binding 0
Decorate 107(g_tTex1di4) DescriptorSet 0
Decorate 110(g_tTex1du4) DescriptorSet 0
Decorate 113(g_tTex3df4) DescriptorSet 0
Decorate 116(g_tTex3di4) DescriptorSet 0
Decorate 119(g_tTex3du4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -310,26 +317,28 @@ Shader version: 450
91: TypePointer Function 90(VS_OUTPUT)
93: 6(float) Constant 0
94: 7(fvec4) ConstantComposite 93 93 93 93
98(g_sSamp2d): 15(ptr) Variable UniformConstant
99: TypeImage 6(float) 1D sampled format:Unknown
100: TypePointer UniformConstant 99
101(g_tTex1df4a): 100(ptr) Variable UniformConstant
102(g_tTex1df4): 100(ptr) Variable UniformConstant
103: TypeImage 24(int) 1D sampled format:Unknown
104: TypePointer UniformConstant 103
105(g_tTex1di4): 104(ptr) Variable UniformConstant
106: TypeImage 41(int) 1D sampled format:Unknown
107: TypePointer UniformConstant 106
108(g_tTex1du4): 107(ptr) Variable UniformConstant
109: TypeImage 6(float) 3D sampled format:Unknown
110: TypePointer UniformConstant 109
111(g_tTex3df4): 110(ptr) Variable UniformConstant
112: TypeImage 24(int) 3D sampled format:Unknown
113: TypePointer UniformConstant 112
114(g_tTex3di4): 113(ptr) Variable UniformConstant
115: TypeImage 41(int) 3D sampled format:Unknown
116: TypePointer UniformConstant 115
117(g_tTex3du4): 116(ptr) Variable UniformConstant
96: TypePointer Output 90(VS_OUTPUT)
97(@entryPointOutput): 96(ptr) Variable Output
100(g_sSamp2d): 15(ptr) Variable UniformConstant
101: TypeImage 6(float) 1D sampled format:Unknown
102: TypePointer UniformConstant 101
103(g_tTex1df4a): 102(ptr) Variable UniformConstant
104(g_tTex1df4): 102(ptr) Variable UniformConstant
105: TypeImage 24(int) 1D sampled format:Unknown
106: TypePointer UniformConstant 105
107(g_tTex1di4): 106(ptr) Variable UniformConstant
108: TypeImage 41(int) 1D sampled format:Unknown
109: TypePointer UniformConstant 108
110(g_tTex1du4): 109(ptr) Variable UniformConstant
111: TypeImage 6(float) 3D sampled format:Unknown
112: TypePointer UniformConstant 111
113(g_tTex3df4): 112(ptr) Variable UniformConstant
114: TypeImage 24(int) 3D sampled format:Unknown
115: TypePointer UniformConstant 114
116(g_tTex3di4): 115(ptr) Variable UniformConstant
117: TypeImage 41(int) 3D sampled format:Unknown
118: TypePointer UniformConstant 117
119(g_tTex3du4): 118(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval20): 8(ptr) Variable Function
@@ -371,6 +380,7 @@ Shader version: 450
Store 77(txval42) 89
95: 8(ptr) AccessChain 92(vsout) 25
Store 95 94
96:90(VS_OUTPUT) Load 92(vsout)
ReturnValue 96
98:90(VS_OUTPUT) Load 92(vsout)
Store 97(@entryPointOutput) 98
Return
FunctionEnd