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:
parent
070aaeafcd
commit
8297936dd6
19 changed files with 600 additions and 520 deletions
|
|
@ -477,12 +477,12 @@ triangle order = cw
|
|||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80002
|
||||
// Id's are bound by 128
|
||||
// Id's are bound by 127
|
||||
|
||||
Capability Tessellation
|
||||
1: ExtInstImport "GLSL.std.450"
|
||||
MemoryModel Logical GLSL450
|
||||
EntryPoint TessellationControl 4 "main" 56 64 83 86 111 124
|
||||
EntryPoint TessellationControl 4 "main" 56 64 83 86 110 123
|
||||
ExecutionMode 4 OutputVertices 3
|
||||
ExecutionMode 4 Triangles
|
||||
ExecutionMode 4 SpacingFractionalOdd
|
||||
|
|
@ -516,16 +516,16 @@ triangle order = cw
|
|||
Name 90 "param"
|
||||
Name 104 "@patchConstantResult"
|
||||
Name 105 "param"
|
||||
Name 111 "@patchConstantOutput.fTessFactor"
|
||||
Name 124 "@patchConstantOutput.fInsideTessFactor"
|
||||
Name 110 "@patchConstantOutput.fTessFactor"
|
||||
Name 123 "@patchConstantOutput.fInsideTessFactor"
|
||||
Decorate 56(I.m_Position) BuiltIn Position
|
||||
Decorate 64(I) Location 0
|
||||
Decorate 83(cpid) BuiltIn InvocationId
|
||||
Decorate 86(@entryPointOutput.m_Position) BuiltIn Position
|
||||
Decorate 111(@patchConstantOutput.fTessFactor) Patch
|
||||
Decorate 111(@patchConstantOutput.fTessFactor) BuiltIn TessLevelOuter
|
||||
Decorate 124(@patchConstantOutput.fInsideTessFactor) Patch
|
||||
Decorate 124(@patchConstantOutput.fInsideTessFactor) BuiltIn TessLevelInner
|
||||
Decorate 110(@patchConstantOutput.fTessFactor) Patch
|
||||
Decorate 110(@patchConstantOutput.fTessFactor) BuiltIn TessLevelOuter
|
||||
Decorate 123(@patchConstantOutput.fInsideTessFactor) Patch
|
||||
Decorate 123(@patchConstantOutput.fInsideTessFactor) BuiltIn TessLevelInner
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
|
|
@ -568,17 +568,16 @@ triangle order = cw
|
|||
86(@entryPointOutput.m_Position): 85(ptr) Variable Output
|
||||
94: TypePointer Output 7(fvec4)
|
||||
96: 9(int) Constant 2
|
||||
97: 9(int) Constant 1
|
||||
97: 9(int) Constant 4
|
||||
98: 9(int) Constant 0
|
||||
100: TypeBool
|
||||
108: 9(int) Constant 4
|
||||
109: TypeArray 6(float) 108
|
||||
110: TypePointer Output 109
|
||||
111(@patchConstantOutput.fTessFactor): 110(ptr) Variable Output
|
||||
114: TypePointer Output 6(float)
|
||||
122: TypeArray 6(float) 96
|
||||
123: TypePointer Output 122
|
||||
124(@patchConstantOutput.fInsideTessFactor): 123(ptr) Variable Output
|
||||
108: TypeArray 6(float) 97
|
||||
109: TypePointer Output 108
|
||||
110(@patchConstantOutput.fTessFactor): 109(ptr) Variable Output
|
||||
113: TypePointer Output 6(float)
|
||||
121: TypeArray 6(float) 96
|
||||
122: TypePointer Output 121
|
||||
123(@patchConstantOutput.fInsideTessFactor): 122(ptr) Variable Output
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
53(I): 12(ptr) Variable Function
|
||||
|
|
@ -632,22 +631,22 @@ triangle order = cw
|
|||
Store 105(param) 106
|
||||
107:14(HS_Output) FunctionCall 17(HS_ConstFunc(struct-HS_Input-vf4-vf41[3];) 105(param)
|
||||
Store 104(@patchConstantResult) 107
|
||||
112: 34(ptr) AccessChain 104(@patchConstantResult) 33 33
|
||||
113: 6(float) Load 112
|
||||
115: 114(ptr) AccessChain 111(@patchConstantOutput.fTessFactor) 33
|
||||
Store 115 113
|
||||
116: 34(ptr) AccessChain 104(@patchConstantResult) 33 32
|
||||
117: 6(float) Load 116
|
||||
118: 114(ptr) AccessChain 111(@patchConstantOutput.fTessFactor) 32
|
||||
Store 118 117
|
||||
119: 34(ptr) AccessChain 104(@patchConstantResult) 33 74
|
||||
120: 6(float) Load 119
|
||||
121: 114(ptr) AccessChain 111(@patchConstantOutput.fTessFactor) 74
|
||||
Store 121 120
|
||||
125: 34(ptr) AccessChain 104(@patchConstantResult) 32
|
||||
126: 6(float) Load 125
|
||||
127: 114(ptr) AccessChain 124(@patchConstantOutput.fInsideTessFactor) 33
|
||||
Store 127 126
|
||||
111: 34(ptr) AccessChain 104(@patchConstantResult) 33 33
|
||||
112: 6(float) Load 111
|
||||
114: 113(ptr) AccessChain 110(@patchConstantOutput.fTessFactor) 33
|
||||
Store 114 112
|
||||
115: 34(ptr) AccessChain 104(@patchConstantResult) 33 32
|
||||
116: 6(float) Load 115
|
||||
117: 113(ptr) AccessChain 110(@patchConstantOutput.fTessFactor) 32
|
||||
Store 117 116
|
||||
118: 34(ptr) AccessChain 104(@patchConstantResult) 33 74
|
||||
119: 6(float) Load 118
|
||||
120: 113(ptr) AccessChain 110(@patchConstantOutput.fTessFactor) 74
|
||||
Store 120 119
|
||||
124: 34(ptr) AccessChain 104(@patchConstantResult) 32
|
||||
125: 6(float) Load 124
|
||||
126: 113(ptr) AccessChain 123(@patchConstantOutput.fInsideTessFactor) 33
|
||||
Store 126 125
|
||||
Branch 103
|
||||
103: Label
|
||||
Return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue