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

SPV: Change barrier emission to conform to Khronos decisions.

Browse Source 
The memory model group agreed to these definitions for how
to map GLSL barrier, memoryBarrier, etc. With HLSL following suit.
This commit is contained in:
John Kessenich
2017-12-11 04:02:24 -07:00
parent 070aaeafcd
commit 8297936dd6
19 changed files with 600 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
View File

@@ -453,12 +453,12 @@ triangle order = cw
Name 69 "param"
Name 71 "param"
Name 75 "i"
Name 76 "param"
Name 78 "param"
Name 82 "i"
Name 83 "param"
Name 85 "param"
Name 89 "@patchConstantResult"
Name 77 "param"
Name 79 "param"
Name 83 "i"
Name 84 "param"
Name 86 "param"
Name 90 "@patchConstantResult"
Name 96 "@patchConstantOutput.tfactor"
Name 110 "@patchConstantOutput.flInFactor"
Name 114 "o"
@@ -497,15 +497,15 @@ triangle order = cw
49(@entryPointOutput): 48(ptr) Variable Output
56: TypePointer Output 14(hs_out_t)
58: 9(int) Constant 2
59: 9(int) Constant 1
59: 9(int) Constant 4
60: 9(int) Constant 0
62: TypeBool
66: TypePointer Function 20
74: 28(int) Constant 1
81: 28(int) Constant 2
88: TypePointer Function 22(hs_pcf_t)
93: 9(int) Constant 4
94: TypeArray 6(float) 93
76: 9(int) Constant 1
82: 28(int) Constant 2
89: TypePointer Function 22(hs_pcf_t)
94: TypeArray 6(float) 59
95: TypePointer Output 94
96(@patchConstantOutput.tfactor): 95(ptr) Variable Output
97: TypePointer Function 6(float)
@@ -525,12 +525,12 @@ triangle order = cw
69(param): 12(ptr) Variable Function
71(param): 13(ptr) Variable Function
75(i): 12(ptr) Variable Function
76(param): 12(ptr) Variable Function
78(param): 13(ptr) Variable Function
82(i): 12(ptr) Variable Function
83(param): 12(ptr) Variable Function
85(param): 13(ptr) Variable Function
89(@patchConstantResult): 88(ptr) Variable Function
77(param): 12(ptr) Variable Function
79(param): 13(ptr) Variable Function
83(i): 12(ptr) Variable Function
84(param): 12(ptr) Variable Function
86(param): 13(ptr) Variable Function
90(@patchConstantResult): 89(ptr) Variable Function
43: 11 Load 42(i)
Store 40(i) 43
47: 9(int) Load 46(cpid)
@@ -555,35 +555,35 @@ triangle order = cw
72:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 69(param) 71(param)
73: 30(ptr) AccessChain 67(pcf_out) 29
Store 73 72
77: 11 Load 75(i)
Store 76(param) 77
Store 78(param) 59
79:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 76(param) 78(param)
80: 30(ptr) AccessChain 67(pcf_out) 74
Store 80 79
84: 11 Load 82(i)
Store 83(param) 84
Store 85(param) 58
86:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 83(param) 85(param)
87: 30(ptr) AccessChain 67(pcf_out) 81
Store 87 86
90: 20 Load 67(pcf_out)
91: 11 Load 40(i)
92:22(hs_pcf_t) FunctionCall 26(PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3];) 90 91
Store 89(@patchConstantResult) 92
98: 97(ptr) AccessChain 89(@patchConstantResult) 29 29
78: 11 Load 75(i)
Store 77(param) 78
Store 79(param) 76
80:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 77(param) 79(param)
81: 30(ptr) AccessChain 67(pcf_out) 74
Store 81 80
85: 11 Load 83(i)
Store 84(param) 85
Store 86(param) 58
87:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 84(param) 86(param)
88: 30(ptr) AccessChain 67(pcf_out) 82
Store 88 87
91: 20 Load 67(pcf_out)
92: 11 Load 40(i)
93:22(hs_pcf_t) FunctionCall 26(PCF(struct-hs_out_t-vf31[3];struct-hs_in_t-vf31[3];) 91 92
Store 90(@patchConstantResult) 93
98: 97(ptr) AccessChain 90(@patchConstantResult) 29 29
99: 6(float) Load 98
101: 100(ptr) AccessChain 96(@patchConstantOutput.tfactor) 29
Store 101 99
102: 97(ptr) AccessChain 89(@patchConstantResult) 29 74
102: 97(ptr) AccessChain 90(@patchConstantResult) 29 74
103: 6(float) Load 102
104: 100(ptr) AccessChain 96(@patchConstantOutput.tfactor) 74
Store 104 103
105: 97(ptr) AccessChain 89(@patchConstantResult) 29 81
105: 97(ptr) AccessChain 90(@patchConstantResult) 29 82
106: 6(float) Load 105
107: 100(ptr) AccessChain 96(@patchConstantOutput.tfactor) 81
107: 100(ptr) AccessChain 96(@patchConstantOutput.tfactor) 82
Store 107 106
111: 97(ptr) AccessChain 89(@patchConstantResult) 74
111: 97(ptr) AccessChain 90(@patchConstantResult) 74
112: 6(float) Load 111
113: 100(ptr) AccessChain 110(@patchConstantOutput.flInFactor) 29
Store 113 112
@@ -608,7 +608,7 @@ triangle order = cw
24(pcf_out): 20 FunctionParameter
25(pcf_in): 11 FunctionParameter
27: Label
114(o): 88(ptr) Variable Function
114(o): 89(ptr) Variable Function
115: 6(float) CompositeExtract 24(pcf_out) 0 0 0
116: 97(ptr) AccessChain 114(o) 29 29
Store 116 115
@@ -616,7 +616,7 @@ triangle order = cw
118: 97(ptr) AccessChain 114(o) 29 74
Store 118 117
119: 6(float) CompositeExtract 24(pcf_out) 2 0 0
120: 97(ptr) AccessChain 114(o) 29 81
120: 97(ptr) AccessChain 114(o) 29 82
Store 120 119
122: 97(ptr) AccessChain 114(o) 74
Store 122 121