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

[dxvk] Barrier interface cleanup

Browse Source
This commit is contained in:
Philip Rebohle 2017-12-01 10:51:58 +01:00
parent c936709aec
commit cc408e3329
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dxvk/dxvk_barrier.cpp
View File

@ -33,7 +33,7 @@ namespace dxvk {
} }
void DxvkBarrierSet::recordCommands(DxvkCommandList& commandList) { void DxvkBarrierSet::recordCommands(const Rc<DxvkCommandList>& commandList) {
if ((m_srcStages | m_dstStages) != 0) { if ((m_srcStages | m_dstStages) != 0) {
VkPipelineStageFlags srcFlags = m_srcStages; VkPipelineStageFlags srcFlags = m_srcStages;
VkPipelineStageFlags dstFlags = m_dstStages; VkPipelineStageFlags dstFlags = m_dstStages;
@ -41,7 +41,7 @@ namespace dxvk {
if (srcFlags == 0) srcFlags = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; if (srcFlags == 0) srcFlags = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
if (dstFlags == 0) dstFlags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; if (dstFlags == 0) dstFlags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
commandList.cmdPipelineBarrier( commandList->cmdPipelineBarrier(
srcFlags, dstFlags, 0, srcFlags, dstFlags, 0,
m_memBarriers.size(), m_memBarriers.data(), m_memBarriers.size(), m_memBarriers.data(),
m_bufBarriers.size(), m_bufBarriers.data(), m_bufBarriers.size(), m_bufBarriers.data(),

2
src/dxvk/dxvk_barrier.h
View File

@ -28,7 +28,7 @@ namespace dxvk {
VkAccessFlags access); VkAccessFlags access);
void recordCommands( void recordCommands(
DxvkCommandList& commandList); const Rc<DxvkCommandList>& commandList);
void reset(); void reset();

2
src/dxvk/dxvk_context.cpp
View File

@ -157,7 +157,7 @@ namespace dxvk {
VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
VK_ACCESS_TRANSFER_WRITE_BIT); VK_ACCESS_TRANSFER_WRITE_BIT);
m_barriers.recordCommands(*m_cmd); m_barriers.recordCommands(m_cmd);
m_cmd->trackResource(dstBuffer); m_cmd->trackResource(dstBuffer);
m_cmd->trackResource(srcBuffer); m_cmd->trackResource(srcBuffer);