rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-21 22:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[vulkan] Move stage and access mask definitions to header

Browse Source
This commit is contained in:
Philip Rebohle 2024-09-18 11:12:44 +02:00 committed by Philip Rebohle
parent 7ec75aaf81
commit d0832f8431
2 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/dxvk/dxvk_barrier.cpp
View File

@ -2,54 +2,6 @@
namespace dxvk { namespace dxvk {
constexpr static VkAccessFlags AccessReadMask
= VK_ACCESS_INDIRECT_COMMAND_READ_BIT
| VK_ACCESS_INDEX_READ_BIT
| VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT
| VK_ACCESS_UNIFORM_READ_BIT
| VK_ACCESS_INPUT_ATTACHMENT_READ_BIT
| VK_ACCESS_SHADER_READ_BIT
| VK_ACCESS_COLOR_ATTACHMENT_READ_BIT
| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT
| VK_ACCESS_TRANSFER_READ_BIT
| VK_ACCESS_MEMORY_READ_BIT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT;
constexpr static VkAccessFlags AccessWriteMask
= VK_ACCESS_SHADER_WRITE_BIT
| VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT
| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT
| VK_ACCESS_TRANSFER_WRITE_BIT
| VK_ACCESS_MEMORY_WRITE_BIT
| VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT;
constexpr static VkAccessFlags AccessDeviceMask
= AccessWriteMask | AccessReadMask;
constexpr static VkAccessFlags AccessHostMask
= VK_ACCESS_HOST_READ_BIT
| VK_ACCESS_HOST_WRITE_BIT;
constexpr static VkPipelineStageFlags StageDeviceMask
= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT
| VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT
| VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
| VK_PIPELINE_STAGE_VERTEX_SHADER_BIT
| VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT
| VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT
| VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT
| VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
| VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT
| VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT
| VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT
| VK_PIPELINE_STAGE_TRANSFER_BIT
| VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT
| VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT
| VK_PIPELINE_STAGE_ALL_COMMANDS_BIT
| VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT;
DxvkBarrierSet:: DxvkBarrierSet(DxvkCmdBuffer cmdBuffer) DxvkBarrierSet:: DxvkBarrierSet(DxvkCmdBuffer cmdBuffer)
: m_cmdBuffer(cmdBuffer) { : m_cmdBuffer(cmdBuffer) {
@ -69,16 +21,16 @@ namespace dxvk {
DxvkAccessFlags access = this->getAccessTypes(srcAccess); DxvkAccessFlags access = this->getAccessTypes(srcAccess);
m_allBarrierSrcStages |= srcStages; m_allBarrierSrcStages |= srcStages;
m_memBarrier.srcStageMask |= srcStages & StageDeviceMask; m_memBarrier.srcStageMask |= srcStages & vk::StageDeviceMask;
m_memBarrier.srcAccessMask |= srcAccess & AccessWriteMask; m_memBarrier.srcAccessMask |= srcAccess & vk::AccessWriteMask;
m_memBarrier.dstStageMask |= dstStages & StageDeviceMask; m_memBarrier.dstStageMask |= dstStages & vk::StageDeviceMask;
if (access.test(DxvkAccess::Write)) { if (access.test(DxvkAccess::Write)) {
m_memBarrier.dstAccessMask |= dstAccess & AccessDeviceMask; m_memBarrier.dstAccessMask |= dstAccess & vk::AccessDeviceMask;
if (dstAccess & AccessHostMask) { if (dstAccess & vk::AccessHostMask) {
m_hostBarrierSrcStages |= srcStages & StageDeviceMask; m_hostBarrierSrcStages |= srcStages & vk::StageDeviceMask;
m_hostBarrierDstAccess |= dstAccess & AccessHostMask; m_hostBarrierDstAccess |= dstAccess & vk::AccessHostMask;
} }
} }
} }
@ -93,16 +45,16 @@ namespace dxvk {
DxvkAccessFlags access = this->getAccessTypes(srcAccess); DxvkAccessFlags access = this->getAccessTypes(srcAccess);
m_allBarrierSrcStages |= srcStages; m_allBarrierSrcStages |= srcStages;
m_memBarrier.srcStageMask |= srcStages & StageDeviceMask; m_memBarrier.srcStageMask |= srcStages & vk::StageDeviceMask;
m_memBarrier.srcAccessMask |= srcAccess & AccessWriteMask; m_memBarrier.srcAccessMask |= srcAccess & vk::AccessWriteMask;
m_memBarrier.dstStageMask |= dstStages & StageDeviceMask; m_memBarrier.dstStageMask |= dstStages & vk::StageDeviceMask;
if (access.test(DxvkAccess::Write)) { if (access.test(DxvkAccess::Write)) {
m_memBarrier.dstAccessMask |= dstAccess & AccessDeviceMask; m_memBarrier.dstAccessMask |= dstAccess & vk::AccessDeviceMask;
if (dstAccess & AccessHostMask) { if (dstAccess & vk::AccessHostMask) {
m_hostBarrierSrcStages |= srcStages & StageDeviceMask; m_hostBarrierSrcStages |= srcStages & vk::StageDeviceMask;
m_hostBarrierDstAccess |= dstAccess & AccessHostMask; m_hostBarrierDstAccess |= dstAccess & vk::AccessHostMask;
} }
} }
@ -122,27 +74,27 @@ namespace dxvk {
VkAccessFlags dstAccess) { VkAccessFlags dstAccess) {
DxvkAccessFlags access = this->getAccessTypes(srcAccess); DxvkAccessFlags access = this->getAccessTypes(srcAccess);
m_allBarrierSrcStages |= srcStages & StageDeviceMask; m_allBarrierSrcStages |= srcStages & vk::StageDeviceMask;
if (srcLayout == dstLayout) { if (srcLayout == dstLayout) {
m_memBarrier.srcStageMask |= srcStages & StageDeviceMask; m_memBarrier.srcStageMask |= srcStages & vk::StageDeviceMask;
m_memBarrier.srcAccessMask |= srcAccess & AccessWriteMask; m_memBarrier.srcAccessMask |= srcAccess & vk::AccessWriteMask;
m_memBarrier.dstStageMask |= dstStages & StageDeviceMask; m_memBarrier.dstStageMask |= dstStages & vk::StageDeviceMask;
if (access.test(DxvkAccess::Write)) { if (access.test(DxvkAccess::Write)) {
m_memBarrier.dstAccessMask |= dstAccess; m_memBarrier.dstAccessMask |= dstAccess;
if (dstAccess & AccessHostMask) { if (dstAccess & vk::AccessHostMask) {
m_hostBarrierSrcStages |= srcStages & StageDeviceMask; m_hostBarrierSrcStages |= srcStages & vk::StageDeviceMask;
m_hostBarrierDstAccess |= dstAccess & AccessHostMask; m_hostBarrierDstAccess |= dstAccess & vk::AccessHostMask;
} }
} }
} else { } else {
VkImageMemoryBarrier2 barrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2 }; VkImageMemoryBarrier2 barrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2 };
barrier.srcStageMask = srcStages & StageDeviceMask; barrier.srcStageMask = srcStages & vk::StageDeviceMask;
barrier.srcAccessMask = srcAccess & AccessWriteMask; barrier.srcAccessMask = srcAccess & vk::AccessWriteMask;
barrier.dstStageMask = dstStages & StageDeviceMask; barrier.dstStageMask = dstStages & vk::StageDeviceMask;
barrier.dstAccessMask = dstAccess & AccessDeviceMask; barrier.dstAccessMask = dstAccess & vk::AccessDeviceMask;
barrier.oldLayout = srcLayout; barrier.oldLayout = srcLayout;
barrier.newLayout = dstLayout; barrier.newLayout = dstLayout;
barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
@ -152,9 +104,9 @@ namespace dxvk {
barrier.subresourceRange.aspectMask = image->formatInfo()->aspectMask; barrier.subresourceRange.aspectMask = image->formatInfo()->aspectMask;
m_imgBarriers.push_back(barrier); m_imgBarriers.push_back(barrier);
if (dstAccess & AccessHostMask) { if (dstAccess & vk::AccessHostMask) {
m_hostBarrierSrcStages |= srcStages; m_hostBarrierSrcStages |= srcStages;
m_hostBarrierDstAccess |= dstAccess & AccessHostMask; m_hostBarrierDstAccess |= dstAccess & vk::AccessHostMask;
} }
access.set(DxvkAccess::Write); access.set(DxvkAccess::Write);
@ -179,8 +131,8 @@ namespace dxvk {
m_allBarrierSrcStages |= srcStages; m_allBarrierSrcStages |= srcStages;
VkBufferMemoryBarrier2 barrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2 }; VkBufferMemoryBarrier2 barrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER_2 };
barrier.srcStageMask = srcStages & StageDeviceMask; barrier.srcStageMask = srcStages & vk::StageDeviceMask;
barrier.srcAccessMask = srcAccess & AccessWriteMask; barrier.srcAccessMask = srcAccess & vk::AccessWriteMask;
barrier.dstStageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT; barrier.dstStageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT;
barrier.dstAccessMask = 0; barrier.dstAccessMask = 0;
barrier.srcQueueFamilyIndex = srcQueue; barrier.srcQueueFamilyIndex = srcQueue;
@ -196,9 +148,9 @@ namespace dxvk {
barrier.dstAccessMask = dstAccess; barrier.dstAccessMask = dstAccess;
acquire.m_bufBarriers.push_back(barrier); acquire.m_bufBarriers.push_back(barrier);
if (dstAccess & AccessHostMask) { if (dstAccess & vk::AccessHostMask) {
acquire.m_hostBarrierSrcStages |= srcStages & StageDeviceMask; acquire.m_hostBarrierSrcStages |= srcStages & vk::StageDeviceMask;
acquire.m_hostBarrierDstAccess |= dstAccess & AccessHostMask; acquire.m_hostBarrierDstAccess |= dstAccess & vk::AccessHostMask;
} }
DxvkAccessFlags access(DxvkAccess::Read, DxvkAccess::Write); DxvkAccessFlags access(DxvkAccess::Read, DxvkAccess::Write);
@ -226,8 +178,8 @@ namespace dxvk {
m_allBarrierSrcStages |= srcStages; m_allBarrierSrcStages |= srcStages;
VkImageMemoryBarrier2 barrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2 }; VkImageMemoryBarrier2 barrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER_2 };
barrier.srcStageMask = srcStages & StageDeviceMask; barrier.srcStageMask = srcStages & vk::StageDeviceMask;
barrier.srcAccessMask = srcAccess & AccessWriteMask; barrier.srcAccessMask = srcAccess & vk::AccessWriteMask;
barrier.dstStageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT; barrier.dstStageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT;
barrier.dstAccessMask = 0; barrier.dstAccessMask = 0;
barrier.oldLayout = srcLayout; barrier.oldLayout = srcLayout;
@ -248,9 +200,9 @@ namespace dxvk {
barrier.dstAccessMask = dstAccess; barrier.dstAccessMask = dstAccess;
acquire.m_imgBarriers.push_back(barrier); acquire.m_imgBarriers.push_back(barrier);
if (dstAccess & AccessHostMask) { if (dstAccess & vk::AccessHostMask) {
acquire.m_hostBarrierSrcStages |= srcStages & StageDeviceMask; acquire.m_hostBarrierSrcStages |= srcStages & vk::StageDeviceMask;
acquire.m_hostBarrierDstAccess |= dstAccess & AccessHostMask; acquire.m_hostBarrierDstAccess |= dstAccess & vk::AccessHostMask;
} }
DxvkAccessFlags access(DxvkAccess::Read, DxvkAccess::Write); DxvkAccessFlags access(DxvkAccess::Read, DxvkAccess::Write);
@ -391,8 +343,8 @@ namespace dxvk {
DxvkAccessFlags DxvkBarrierSet::getAccessTypes(VkAccessFlags flags) { DxvkAccessFlags DxvkBarrierSet::getAccessTypes(VkAccessFlags flags) {
DxvkAccessFlags result; DxvkAccessFlags result;
if (flags & AccessReadMask) result.set(DxvkAccess::Read); if (flags & vk::AccessReadMask) result.set(DxvkAccess::Read);
if (flags & AccessWriteMask) result.set(DxvkAccess::Write); if (flags & vk::AccessWriteMask) result.set(DxvkAccess::Write);
return result; return result;
} }

48
src/vulkan/vulkan_util.h
View File

@ -11,6 +11,54 @@
namespace dxvk::vk { namespace dxvk::vk {
constexpr static VkAccessFlags AccessReadMask
= VK_ACCESS_INDIRECT_COMMAND_READ_BIT
| VK_ACCESS_INDEX_READ_BIT
| VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT
| VK_ACCESS_UNIFORM_READ_BIT
| VK_ACCESS_INPUT_ATTACHMENT_READ_BIT
| VK_ACCESS_SHADER_READ_BIT
| VK_ACCESS_COLOR_ATTACHMENT_READ_BIT
| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT
| VK_ACCESS_TRANSFER_READ_BIT
| VK_ACCESS_MEMORY_READ_BIT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT;
constexpr static VkAccessFlags AccessWriteMask
= VK_ACCESS_SHADER_WRITE_BIT
| VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT
| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT
| VK_ACCESS_TRANSFER_WRITE_BIT
| VK_ACCESS_MEMORY_WRITE_BIT
| VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT;
constexpr static VkAccessFlags AccessDeviceMask
= AccessWriteMask | AccessReadMask;
constexpr static VkAccessFlags AccessHostMask
= VK_ACCESS_HOST_READ_BIT
| VK_ACCESS_HOST_WRITE_BIT;
constexpr static VkPipelineStageFlags StageDeviceMask
= VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT
| VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT
| VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
| VK_PIPELINE_STAGE_VERTEX_SHADER_BIT
| VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT
| VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT
| VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT
| VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
| VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT
| VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT
| VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT
| VK_PIPELINE_STAGE_TRANSFER_BIT
| VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT
| VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT
| VK_PIPELINE_STAGE_ALL_COMMANDS_BIT
| VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT;
inline VkImageSubresourceRange makeSubresourceRange( inline VkImageSubresourceRange makeSubresourceRange(
const VkImageSubresourceLayers& layers) { const VkImageSubresourceLayers& layers) {
VkImageSubresourceRange range; VkImageSubresourceRange range;