Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes Vulkan hazards reported by validation layers.

Browse Source 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D5024
This was SVN commit r27665.
This commit is contained in:
Vladislav Belov 2023-06-05 16:32:18 +00:00
parent 1b948580c7
commit 9707931878
9 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
binaries/data/config/default.cfg
View File

@ -126,16 +126,21 @@ cursorbackend = "sdl"
rendererbackend = "gl"
; Enables additional debug information in renderer backend.
renderer.backend.debugcontext = "false"
renderer.backend.debugmessages = "false"
renderer.backend.debuglabels = "false"
renderer.backend.debugscopedlabels = "false"
renderer.backend.debugcontext = false
renderer.backend.debugmessages = false
renderer.backend.debuglabels = false
renderer.backend.debugscopedlabels = false
renderer.backend.gl.enableframebufferinvalidating = "false"
renderer.backend.gl.enableframebufferinvalidating = false
renderer.backend.vulkan.disabledescriptorindexing = "false"
renderer.backend.vulkan.disabledescriptorindexing = false
renderer.backend.vulkan.deviceindexoverride = -1
renderer.backend.vulkan.debugbarrierafterframebufferpass = false
renderer.backend.vulkan.debugwaitidlebeforeacquire = false
renderer.backend.vulkan.debugwaitidlebeforepresent = false
renderer.backend.vulkan.debugwaitidleafterpresent = false
; Should not be edited. It's used only for preventing of running fixed pipeline.
renderpath = default

37
source/renderer/backend/vulkan/DeviceCommandContext.cpp
View File

@ -22,6 +22,7 @@
#include "lib/bits.h"
#include "maths/MathUtil.h"
#include "ps/CLogger.h"
#include "ps/ConfigDB.h"
#include "ps/containers/Span.h"
#include "ps/containers/StaticVector.h"
#include "renderer/backend/vulkan/Buffer.h"
@ -276,6 +277,16 @@ void CDeviceCommandContext::CUploadRing::ExecuteUploads(
if (m_BlockOffset == 0)
return;
const VkPipelineStageFlags stageMask =
m_Type == IBuffer::Type::UNIFORM
? VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
: VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
Utilities::SubmitBufferMemoryBarrier(
commandBuffer, m_Buffer.get(), 0, VK_WHOLE_SIZE,
VK_ACCESS_MEMORY_READ_BIT, VK_ACCESS_TRANSFER_WRITE_BIT,
stageMask, VK_PIPELINE_STAGE_TRANSFER_BIT);
VkBufferCopy region{};
region.srcOffset = m_BlockIndex * m_Capacity;
region.dstOffset = 0;
@ -286,19 +297,10 @@ void CDeviceCommandContext::CUploadRing::ExecuteUploads(
m_StagingBuffer->GetVkBuffer(), m_Buffer->GetVkBuffer(),
1, &region);
VkMemoryBarrier memoryBarrier{};
memoryBarrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
memoryBarrier.srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT;
memoryBarrier.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
const VkPipelineStageFlags dstStageMask =
m_Type == IBuffer::Type::UNIFORM
? VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
: VK_PIPELINE_STAGE_VERTEX_INPUT_BIT;
vkCmdPipelineBarrier(
commandBuffer,
VK_PIPELINE_STAGE_TRANSFER_BIT, dstStageMask, 0,
1, &memoryBarrier, 0, nullptr, 0, nullptr);
Utilities::SubmitBufferMemoryBarrier(
commandBuffer, m_Buffer.get(), 0, VK_WHOLE_SIZE,
VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_MEMORY_READ_BIT,
VK_PIPELINE_STAGE_TRANSFER_BIT, stageMask);
m_BlockIndex = (m_BlockIndex + 1) % NUMBER_OF_FRAMES_IN_FLIGHT;
m_BlockOffset = 0;
@ -365,6 +367,10 @@ std::unique_ptr<IDeviceCommandContext> CDeviceCommandContext::Create(CDevice* de
vkUpdateDescriptorSets(
device->GetVkDevice(), 1, &writeDescriptorSet, 0, nullptr);
CFG_GET_VAL(
"renderer.backend.vulkan.debugbarrierafterframebufferpass",
deviceCommandContext->m_DebugBarrierAfterFramebufferPass);
return deviceCommandContext;
}
@ -667,6 +673,9 @@ void CDeviceCommandContext::EndFramebufferPass()
if (m_ShaderProgram)
m_ShaderProgram->Unbind();
m_ShaderProgram = nullptr;
if (m_DebugBarrierAfterFramebufferPass)
Utilities::SubmitDebugSyncMemoryBarrier(m_CommandContext->GetCommandBuffer());
}
void CDeviceCommandContext::ReadbackFramebufferSync(
@ -894,7 +903,7 @@ void CDeviceCommandContext::SetTexture(const int32_t bindingSlot, ITexture* text
if (!m_Device->GetDescriptorManager().UseDescriptorIndexing())
{
// We can't bind textures which are used as color attachments.
// We can't bind textures which are used as attachments.
const auto& colorAttachments = m_Framebuffer->GetColorAttachments();
ENSURE(std::find(
colorAttachments.begin(), colorAttachments.end(), textureToBind) == colorAttachments.end());

2
source/renderer/backend/vulkan/DeviceCommandContext.h
View File

@ -186,6 +186,8 @@ private:
void* data = nullptr;
};
PS::StaticVector<QueuedReadback, 2> m_QueuedReadbacks;
bool m_DebugBarrierAfterFramebufferPass = false;
};
} // namespace Vulkan

2
source/renderer/backend/vulkan/RingCommandContext.cpp
View File

@ -313,7 +313,7 @@ void CRingCommandContext::Begin()
VkCommandBufferBeginInfo beginInfo{};
beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
beginInfo.flags = 0;
beginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
beginInfo.pInheritanceInfo = nullptr;
ENSURE_VK_SUCCESS(vkBeginCommandBuffer(item.commandBuffer, &beginInfo));
}

15
source/renderer/backend/vulkan/SubmitScheduler.cpp
View File

@ -19,6 +19,7 @@
#include "SubmitScheduler.h"
#include "ps/ConfigDB.h"
#include "renderer/backend/vulkan/Device.h"
#include "renderer/backend/vulkan/RingCommandContext.h"
#include "renderer/backend/vulkan/SwapChain.h"
@ -66,6 +67,10 @@ CSubmitScheduler::CSubmitScheduler(
device, NUMBER_OF_FRAMES_IN_FLIGHT, queueFamilyIndex, *this);
m_PresentCommandContext = std::make_unique<CRingCommandContext>(
device, NUMBER_OF_FRAMES_IN_FLIGHT, queueFamilyIndex, *this);
CFG_GET_VAL("renderer.backend.vulkan.debugwaitidlebeforeacquire", m_DebugWaitIdleBeforeAcquire);
CFG_GET_VAL("renderer.backend.vulkan.debugwaitidlebeforepresent", m_DebugWaitIdleBeforePresent);
CFG_GET_VAL("renderer.backend.vulkan.debugwaitidleafterpresent", m_DebugWaitIdleAfterPresent);
}
CSubmitScheduler::~CSubmitScheduler()
@ -88,6 +93,9 @@ CSubmitScheduler::~CSubmitScheduler()
bool CSubmitScheduler::AcquireNextImage(CSwapChain& swapChain)
{
if (m_DebugWaitIdleBeforeAcquire)
vkDeviceWaitIdle(m_Device->GetVkDevice());
FrameObject& frameObject = m_FrameObjects[m_FrameID % m_FrameObjects.size()];
if (!swapChain.AcquireNextImage(frameObject.acquireImageSemaphore))
return false;
@ -106,7 +114,14 @@ void CSubmitScheduler::Present(CSwapChain& swapChain)
m_NextSubmitSignalSemaphore = frameObject.submitDone;
m_PresentCommandContext->Flush();
Flush();
if (m_DebugWaitIdleBeforePresent)
vkDeviceWaitIdle(m_Device->GetVkDevice());
swapChain.Present(frameObject.submitDone, m_Queue);
if (m_DebugWaitIdleAfterPresent)
vkDeviceWaitIdle(m_Device->GetVkDevice());
}
CSubmitScheduler::SubmitHandle CSubmitScheduler::Submit(VkCommandBuffer commandBuffer)

4
source/renderer/backend/vulkan/SubmitScheduler.h
View File

@ -106,6 +106,10 @@ private:
std::unique_ptr<CRingCommandContext> m_AcquireCommandContext;
std::unique_ptr<CRingCommandContext> m_PresentCommandContext;
bool m_DebugWaitIdleBeforeAcquire = false;
bool m_DebugWaitIdleBeforePresent = false;
bool m_DebugWaitIdleAfterPresent = false;
};
} // namespace Vulkan

2
source/renderer/backend/vulkan/SwapChain.cpp
View File

@ -283,7 +283,7 @@ void CSwapChain::SubmitCommandsAfterAcquireNextImage(
0, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
firstAcquirement ? VK_IMAGE_LAYOUT_UNDEFINED : VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
firstAcquirement ? VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT : VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
if (!m_DepthTexture->IsInitialized())
{
Utilities::SubmitImageMemoryBarrier(

2
source/renderer/backend/vulkan/Utilities.cpp
View File

@ -96,7 +96,7 @@ void SubmitImageMemoryBarrier(
void SubmitBufferMemoryBarrier(
VkCommandBuffer commandBuffer, CBuffer* buffer,
const uint32_t offset, const uint32_t size,
const VkDeviceSize offset, const VkDeviceSize size,
const VkAccessFlags srcAccessMask, const VkAccessFlags dstAccessMask,
const VkPipelineStageFlags srcStageMask, const VkPipelineStageFlags dstStageMask)
{

2
source/renderer/backend/vulkan/Utilities.h
View File

@ -65,7 +65,7 @@ void SubmitImageMemoryBarrier(
void SubmitBufferMemoryBarrier(
VkCommandBuffer commandBuffer, CBuffer* buffer,
const uint32_t offset, const uint32_t size,
const VkDeviceSize offset, const VkDeviceSize size,
const VkAccessFlags srcAccessMask, const VkAccessFlags dstAccessMask,
const VkPipelineStageFlags srcStageMask, const VkPipelineStageFlags dstStageMask);