SPV: Change barrier emission to conform to Khronos decisions.

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

View file

@ -434,12 +434,12 @@ triangle order = cw
Name 68 "param"
Name 70 "param"
Name 74 "i"
Name 75 "param"
Name 77 "param"
Name 81 "i"
Name 82 "param"
Name 84 "param"
Name 88 "@patchConstantResult"
Name 76 "param"
Name 78 "param"
Name 82 "i"
Name 83 "param"
Name 85 "param"
Name 89 "@patchConstantResult"
Name 94 "@patchConstantOutput.tfactor"
Name 108 "@patchConstantOutput.flInFactor"
Name 112 "o"
@ -478,15 +478,15 @@ triangle order = cw
48(@entryPointOutput): 47(ptr) Variable Output
55: TypePointer Output 14(hs_out_t)
57: 9(int) Constant 2
58: 9(int) Constant 1
58: 9(int) Constant 4
59: 9(int) Constant 0
61: TypeBool
65: TypePointer Function 20
73: 29(int) Constant 1
80: 29(int) Constant 2
87: TypePointer Function 22(hs_pcf_t)
91: 9(int) Constant 4
92: TypeArray 6(float) 91
75: 9(int) Constant 1
81: 29(int) Constant 2
88: TypePointer Function 22(hs_pcf_t)
92: TypeArray 6(float) 58
93: TypePointer Output 92
94(@patchConstantOutput.tfactor): 93(ptr) Variable Output
95: TypePointer Function 6(float)
@ -506,12 +506,12 @@ triangle order = cw
68(param): 12(ptr) Variable Function
70(param): 13(ptr) Variable Function
74(i): 12(ptr) Variable Function
75(param): 12(ptr) Variable Function
77(param): 13(ptr) Variable Function
81(i): 12(ptr) Variable Function
82(param): 12(ptr) Variable Function
84(param): 13(ptr) Variable Function
88(@patchConstantResult): 87(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
42: 11 Load 41(i)
Store 39(i) 42
46: 9(int) Load 45(cpid)
@ -536,34 +536,34 @@ triangle order = cw
71:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 68(param) 70(param)
72: 27(ptr) AccessChain 66(pcf_out) 30
Store 72 71
76: 11 Load 74(i)
Store 75(param) 76
Store 77(param) 58
78:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 75(param) 77(param)
79: 27(ptr) AccessChain 66(pcf_out) 73
Store 79 78
83: 11 Load 81(i)
Store 82(param) 83
Store 84(param) 57
85:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 82(param) 84(param)
86: 27(ptr) AccessChain 66(pcf_out) 80
Store 86 85
89: 20 Load 66(pcf_out)
90:22(hs_pcf_t) FunctionCall 25(PCF(struct-hs_out_t-vf31[3];) 89
Store 88(@patchConstantResult) 90
96: 95(ptr) AccessChain 88(@patchConstantResult) 30 30
77: 11 Load 74(i)
Store 76(param) 77
Store 78(param) 75
79:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 76(param) 78(param)
80: 27(ptr) AccessChain 66(pcf_out) 73
Store 80 79
84: 11 Load 82(i)
Store 83(param) 84
Store 85(param) 57
86:14(hs_out_t) FunctionCall 18(@main(struct-hs_in_t-vf31[3];u1;) 83(param) 85(param)
87: 27(ptr) AccessChain 66(pcf_out) 81
Store 87 86
90: 20 Load 66(pcf_out)
91:22(hs_pcf_t) FunctionCall 25(PCF(struct-hs_out_t-vf31[3];) 90
Store 89(@patchConstantResult) 91
96: 95(ptr) AccessChain 89(@patchConstantResult) 30 30
97: 6(float) Load 96
99: 98(ptr) AccessChain 94(@patchConstantOutput.tfactor) 30
Store 99 97
100: 95(ptr) AccessChain 88(@patchConstantResult) 30 73
100: 95(ptr) AccessChain 89(@patchConstantResult) 30 73
101: 6(float) Load 100
102: 98(ptr) AccessChain 94(@patchConstantOutput.tfactor) 73
Store 102 101
103: 95(ptr) AccessChain 88(@patchConstantResult) 30 80
103: 95(ptr) AccessChain 89(@patchConstantResult) 30 81
104: 6(float) Load 103
105: 98(ptr) AccessChain 94(@patchConstantOutput.tfactor) 80
105: 98(ptr) AccessChain 94(@patchConstantOutput.tfactor) 81
Store 105 104
109: 95(ptr) AccessChain 88(@patchConstantResult) 73
109: 95(ptr) AccessChain 89(@patchConstantResult) 73
110: 6(float) Load 109
111: 98(ptr) AccessChain 108(@patchConstantOutput.flInFactor) 30
Store 111 110
@ -587,7 +587,7 @@ triangle order = cw
25(PCF(struct-hs_out_t-vf31[3];):22(hs_pcf_t) Function None 23
24(pcf_out): 20 FunctionParameter
26: Label
112(o): 87(ptr) Variable Function
112(o): 88(ptr) Variable Function
113: 6(float) CompositeExtract 24(pcf_out) 0 0 0
114: 95(ptr) AccessChain 112(o) 30 30
Store 114 113
@ -595,7 +595,7 @@ triangle order = cw
116: 95(ptr) AccessChain 112(o) 30 73
Store 116 115
117: 6(float) CompositeExtract 24(pcf_out) 2 0 0
118: 95(ptr) AccessChain 112(o) 30 80
118: 95(ptr) AccessChain 112(o) 30 81
Store 118 117
120: 95(ptr) AccessChain 112(o) 73
Store 120 119