Skip to content

G
glslang
Unverified Commit e9405d0b by John Kessenich Committed by GitHub
Options

Merge pull request #1531 from jeffbolznv/workgroup_nonprivate

Fix flags.nonprivate to be true for workgroup memory, which is implicitly workgroupcoherent/nonprivate
parents 4685f324 ab3c965a
Showing with 11 additions and 11 deletions
SPIRV/GlslangToSpv.cpp 100755 → 100644
...@@ -554,11 +554,11 @@ spv::Builder::AccessChain::CoherentFlags TGlslangToSpvTraverser::TranslateCohere ...@@ -554,11 +554,11 @@ spv::Builder::AccessChain::CoherentFlags TGlslangToSpvTraverser::TranslateCohere
flags.subgroupcoherent = type.getQualifier().subgroupcoherent; flags.subgroupcoherent = type.getQualifier().subgroupcoherent;
// *coherent variables are implicitly nonprivate in GLSL // *coherent variables are implicitly nonprivate in GLSL
flags.nonprivate = type.getQualifier().nonprivate || flags.nonprivate = type.getQualifier().nonprivate ||
type.getQualifier().subgroupcoherent || flags.subgroupcoherent ||
type.getQualifier().workgroupcoherent || flags.workgroupcoherent ||
type.getQualifier().queuefamilycoherent || flags.queuefamilycoherent ||
type.getQualifier().devicecoherent || flags.devicecoherent ||
type.getQualifier().coherent; flags.coherent;
flags.volatil = type.getQualifier().volatil; flags.volatil = type.getQualifier().volatil;
flags.isImage = type.getBasicType() == glslang::EbtSampler; flags.isImage = type.getBasicType() == glslang::EbtSampler;
return flags; return flags;
......
Test/baseResults/spv.memoryScopeSemantics.comp.out
...@@ -158,12 +158,12 @@ spv.memoryScopeSemantics.comp ...@@ -158,12 +158,12 @@ spv.memoryScopeSemantics.comp
72(y): 20(ptr) Variable Function 72(y): 20(ptr) Variable Function
19: 6(int) AtomicIAdd 10(atomi) 12 18 11 19: 6(int) AtomicIAdd 10(atomi) 12 18 11
Store 8(origi) 19 Store 8(origi) 19
25: 15(int) Load 24(value) MakePointerVisibleKHR 26 25: 15(int) Load 24(value) MakePointerVisibleKHR NonPrivatePointerKHR 26
27: 15(int) AtomicAnd 23(atomu) 16 17 25 27: 15(int) AtomicAnd 23(atomu) 16 17 25
Store 21(origu) 27 Store 21(origu) 27
31: 6(int) AtomicLoad 10(atomi) 12 30 31: 6(int) AtomicLoad 10(atomi) 12 30
Store 8(origi) 31 Store 8(origi) 31
32: 15(int) Load 24(value) MakePointerVisibleKHR 26 32: 15(int) Load 24(value) MakePointerVisibleKHR NonPrivatePointerKHR 26
AtomicStore 23(atomu) 12 33 32 AtomicStore 23(atomu) 12 33 32
41: 40(ptr) ImageTexelPointer 36(imagei) 39 17 41: 40(ptr) ImageTexelPointer 36(imagei) 39 17
42: 6(int) AtomicLoad 41 12 30 42: 6(int) AtomicLoad 41 12 30
...@@ -177,7 +177,7 @@ spv.memoryScopeSemantics.comp ...@@ -177,7 +177,7 @@ spv.memoryScopeSemantics.comp
Store 21(origu) 53 Store 21(origu) 53
54: 15(int) AtomicXor 23(atomu) 12 17 52 54: 15(int) AtomicXor 23(atomu) 12 17 52
Store 21(origu) 54 Store 21(origu) 54
55: 15(int) Load 24(value) MakePointerVisibleKHR 26 55: 15(int) Load 24(value) MakePointerVisibleKHR NonPrivatePointerKHR 26
56: 15(int) AtomicUMin 23(atomu) 12 17 55 56: 15(int) AtomicUMin 23(atomu) 12 17 55
Store 21(origu) 56 Store 21(origu) 56
58: 6(int) AtomicSMax 10(atomi) 12 17 57 58: 6(int) AtomicSMax 10(atomi) 12 17 57
...@@ -185,7 +185,7 @@ spv.memoryScopeSemantics.comp ...@@ -185,7 +185,7 @@ spv.memoryScopeSemantics.comp
59: 6(int) Load 8(origi) 59: 6(int) Load 8(origi)
60: 6(int) AtomicExchange 10(atomi) 12 17 59 60: 6(int) AtomicExchange 10(atomi) 12 17 59
Store 8(origi) 60 Store 8(origi) 60
62: 15(int) Load 24(value) MakePointerVisibleKHR 26 62: 15(int) Load 24(value) MakePointerVisibleKHR NonPrivatePointerKHR 26
64: 15(int) AtomicCompareExchange 23(atomu) 12 63 63 62 61 64: 15(int) AtomicCompareExchange 23(atomu) 12 63 63 62 61
Store 21(origu) 64 Store 21(origu) 64
69: 68(ptr) AccessChain 67(bufferu) 38 69: 68(ptr) AccessChain 67(bufferu) 38
...@@ -231,8 +231,8 @@ spv.memoryScopeSemantics.comp ...@@ -231,8 +231,8 @@ spv.memoryScopeSemantics.comp
124: 118 Load 123 124: 118 Load 123
129: 128(fvec4) ImageSampleExplicitLod 124 127 Lod NonPrivateTexelKHR 126 129: 128(fvec4) ImageSampleExplicitLod 124 127 Lod NonPrivateTexelKHR 126
134:130(int64_t) AtomicUMax 132(atomu64) 12 17 133 134:130(int64_t) AtomicUMax 132(atomu64) 12 17 133
Store 132(atomu64) 134 MakePointerAvailableKHR 26 Store 132(atomu64) 134 MakePointerAvailableKHR NonPrivatePointerKHR 26
139:130(int64_t) Load 132(atomu64) MakePointerVisibleKHR 26 139:130(int64_t) Load 132(atomu64) MakePointerVisibleKHR NonPrivatePointerKHR 26
140:135(int64_t) Bitcast 139 140:135(int64_t) Bitcast 139
141:135(int64_t) AtomicCompareExchange 137(atomi64) 12 63 63 140 138 141:135(int64_t) AtomicCompareExchange 137(atomi64) 12 63 63 140 138
Return Return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment