backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxbc] Fix memory semantics for atomic operations

Browse Source
This commit is contained in:
Philip Rebohle 2020-02-13 01:15:06 +01:00
parent 4aa6800e95
commit 313d46984d
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dxbc/dxbc_compiler.cpp
View File

@ -2279,9 +2279,13 @@ namespace dxvk {
// (srcX) As above // (srcX) As above
const DxbcBufferInfo bufferInfo = getBufferInfo(ins.dst[ins.dstCount - 1]); const DxbcBufferInfo bufferInfo = getBufferInfo(ins.dst[ins.dstCount - 1]);
const bool isImm = ins.dstCount == 2; bool isImm = ins.dstCount == 2;
const bool isUav = ins.dst[ins.dstCount - 1].type == DxbcOperandType::UnorderedAccessView; bool isUav = ins.dst[ins.dstCount - 1].type == DxbcOperandType::UnorderedAccessView;
bool isSsbo = m_moduleInfo.options.minSsboAlignment <= bufferInfo.align
&& bufferInfo.type != DxbcResourceType::Typed
&& isUav;
// Perform atomic operations on UAVs only if the UAV // Perform atomic operations on UAVs only if the UAV
// is bound and if there is nothing else stopping us. // is bound and if there is nothing else stopping us.
DxbcConditional cond; DxbcConditional cond;
@ -2317,8 +2321,11 @@ namespace dxvk {
if (isUav) { if (isUav) {
scope = spv::ScopeDevice; scope = spv::ScopeDevice;
semantics = spv::MemorySemanticsImageMemoryMask semantics = spv::MemorySemanticsAcquireReleaseMask;
| spv::MemorySemanticsAcquireReleaseMask;
semantics |= isSsbo
? spv::MemorySemanticsUniformMemoryMask
: spv::MemorySemanticsImageMemoryMask;
} else { } else {
scope = spv::ScopeWorkgroup; scope = spv::ScopeWorkgroup;
semantics = spv::MemorySemanticsWorkgroupMemoryMask semantics = spv::MemorySemanticsWorkgroupMemoryMask