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] Use global memory barrier instead of resource barriers if possible

Browse Source 
Hardware doesn't support this type of fine-grained synchronization
anyway, so we really don't need the driver to iterate over anything
up to hundreds of structs - except for layout transitions.
This commit is contained in:
Philip Rebohle 2019-04-02 14:48:39 +02:00
parent 67b9b6e1e1
commit adaf98bb9d
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/dxvk/dxvk_barrier.cpp
View File

@ -24,23 +24,8 @@ namespace dxvk {
m_srcStages |= srcStages; m_srcStages |= srcStages;
m_dstStages |= dstStages; m_dstStages |= dstStages;
if (srcStages == VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT m_srcAccess |= srcAccess;
|| dstStages == VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT) m_dstAccess |= dstAccess;
access.set(DxvkAccess::Write);
if (access.test(DxvkAccess::Write)) {
VkBufferMemoryBarrier barrier;
barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
barrier.pNext = nullptr;
barrier.srcAccessMask = srcAccess;
barrier.dstAccessMask = dstAccess;
barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
barrier.buffer = bufSlice.handle;
barrier.offset = bufSlice.offset;
barrier.size = bufSlice.length;
m_bufBarriers.push_back(barrier);
}
m_bufSlices.push_back({ bufSlice, access }); m_bufSlices.push_back({ bufSlice, access });
} }
@ -60,12 +45,10 @@ namespace dxvk {
m_srcStages |= srcStages; m_srcStages |= srcStages;
m_dstStages |= dstStages; m_dstStages |= dstStages;
if (srcStages == VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT if (srcLayout == dstLayout) {
|| dstStages == VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT m_srcAccess |= srcAccess;
|| srcLayout != dstLayout) m_dstAccess |= dstAccess;
access.set(DxvkAccess::Write); } else {
if (access.test(DxvkAccess::Write)) {
VkImageMemoryBarrier barrier; VkImageMemoryBarrier barrier;
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
barrier.pNext = nullptr; barrier.pNext = nullptr;
@ -85,23 +68,10 @@ namespace dxvk {
} }
void DxvkBarrierSet::accessMemory(
VkPipelineStageFlags srcStages,
VkAccessFlags srcAccess,
VkPipelineStageFlags dstStages,
VkAccessFlags dstAccess) {
m_srcStages |= srcStages;
m_dstStages |= dstStages;
m_srcAccess |= srcAccess;
m_dstAccess |= dstAccess;
}
bool DxvkBarrierSet::isBufferDirty( bool DxvkBarrierSet::isBufferDirty(
const DxvkBufferSliceHandle& bufSlice, const DxvkBufferSliceHandle& bufSlice,
DxvkAccessFlags bufAccess) { DxvkAccessFlags bufAccess) {
bool result = m_srcAccess || m_dstAccess; bool result = false;
for (uint32_t i = 0; i < m_bufSlices.size() && !result; i++) { for (uint32_t i = 0; i < m_bufSlices.size() && !result; i++) {
const DxvkBufferSliceHandle& dstSlice = m_bufSlices[i].slice; const DxvkBufferSliceHandle& dstSlice = m_bufSlices[i].slice;
@ -119,8 +89,7 @@ namespace dxvk {
const Rc<DxvkImage>& image, const Rc<DxvkImage>& image,
const VkImageSubresourceRange& imgSubres, const VkImageSubresourceRange& imgSubres,
DxvkAccessFlags imgAccess) { DxvkAccessFlags imgAccess) {
bool result = (m_srcStages & image->info().stages) bool result = false;
&& (m_srcAccess & image->info().access);
for (uint32_t i = 0; i < m_imgSlices.size() && !result; i++) { for (uint32_t i = 0; i < m_imgSlices.size() && !result; i++) {
const VkImageSubresourceRange& dstSubres = m_imgSlices[i].subres; const VkImageSubresourceRange& dstSubres = m_imgSlices[i].subres;
@ -138,7 +107,7 @@ namespace dxvk {
DxvkAccessFlags DxvkBarrierSet::getBufferAccess( DxvkAccessFlags DxvkBarrierSet::getBufferAccess(
const DxvkBufferSliceHandle& bufSlice) { const DxvkBufferSliceHandle& bufSlice) {
DxvkAccessFlags access = getAccessTypes(m_srcAccess); DxvkAccessFlags access;
for (uint32_t i = 0; i < m_bufSlices.size(); i++) { for (uint32_t i = 0; i < m_bufSlices.size(); i++) {
const DxvkBufferSliceHandle& dstSlice = m_bufSlices[i].slice; const DxvkBufferSliceHandle& dstSlice = m_bufSlices[i].slice;
@ -156,7 +125,7 @@ namespace dxvk {
DxvkAccessFlags DxvkBarrierSet::getImageAccess( DxvkAccessFlags DxvkBarrierSet::getImageAccess(
const Rc<DxvkImage>& image, const Rc<DxvkImage>& image,
const VkImageSubresourceRange& imgSubres) { const VkImageSubresourceRange& imgSubres) {
DxvkAccessFlags access = getAccessTypes(m_srcAccess & image->info().access); DxvkAccessFlags access;
for (uint32_t i = 0; i < m_imgSlices.size(); i++) { for (uint32_t i = 0; i < m_imgSlices.size(); i++) {
const VkImageSubresourceRange& dstSubres = m_imgSlices[i].subres; const VkImageSubresourceRange& dstSubres = m_imgSlices[i].subres;
@ -194,8 +163,9 @@ namespace dxvk {
commandList->cmdPipelineBarrier( commandList->cmdPipelineBarrier(
m_cmdBuffer, srcFlags, dstFlags, 0, m_cmdBuffer, srcFlags, dstFlags, 0,
pMemBarrier ? 1 : 0, pMemBarrier, pMemBarrier ? 1 : 0, pMemBarrier,
m_bufBarriers.size(), m_bufBarriers.data(), 0, nullptr,
m_imgBarriers.size(), m_imgBarriers.data()); m_imgBarriers.size(),
m_imgBarriers.data());
this->reset(); this->reset();
} }
@ -206,7 +176,6 @@ namespace dxvk {
m_srcStages = 0; m_srcStages = 0;
m_dstStages = 0; m_dstStages = 0;
m_bufBarriers.resize(0);
m_imgBarriers.resize(0); m_imgBarriers.resize(0);
m_bufSlices.resize(0); m_bufSlices.resize(0);

9
src/dxvk/dxvk_barrier.h
View File

@ -37,12 +37,6 @@ namespace dxvk {
VkPipelineStageFlags dstStages, VkPipelineStageFlags dstStages,
VkAccessFlags dstAccess); VkAccessFlags dstAccess);
void accessMemory(
VkPipelineStageFlags srcStages,
VkAccessFlags srcAccess,
VkPipelineStageFlags dstStages,
VkAccessFlags dstAccess);
bool isBufferDirty( bool isBufferDirty(
const DxvkBufferSliceHandle& bufSlice, const DxvkBufferSliceHandle& bufSlice,
DxvkAccessFlags bufAccess); DxvkAccessFlags bufAccess);
@ -89,8 +83,7 @@ namespace dxvk {
VkAccessFlags m_srcAccess = 0; VkAccessFlags m_srcAccess = 0;
VkAccessFlags m_dstAccess = 0; VkAccessFlags m_dstAccess = 0;
std::vector<VkBufferMemoryBarrier> m_bufBarriers; std::vector<VkImageMemoryBarrier> m_imgBarriers;
std::vector<VkImageMemoryBarrier> m_imgBarriers;
std::vector<BufSlice> m_bufSlices; std::vector<BufSlice> m_bufSlices;
std::vector<ImgSlice> m_imgSlices; std::vector<ImgSlice> m_imgSlices;