Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/vsg/app/TransferTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#include <vsg/vk/CommandBuffer.h>
#include <vsg/vk/ResourceRequirements.h>
#include <vsg/vk/Semaphore.h>
#include <vsg/vk/Fence.h>

namespace vsg
{
Expand Down Expand Up @@ -97,6 +98,8 @@ namespace vsg
VkDeviceSize dataTotalSize = 0;
VkDeviceSize imageTotalSize = 0;

ref_ptr<Fence> transferCompleteFence;
bool waitOnTransferFence = false;
ref_ptr<Semaphore> transferCompleteSemaphore;
ref_ptr<Semaphore> transferConsumerCompletedSemaphore;

Expand Down
8 changes: 4 additions & 4 deletions src/vsg/app/TransferTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ TransferTask::TransferResult TransferTask::_transferData(DataToCopy& dataToCopy)
log(level, " totalSize = ", totalSize);

auto& frame = *(dataToCopy.frames[dataToCopy.frameIndex]);
auto& fence = frame.fence;
auto& fence = dataToCopy.transferCompleteFence;
auto& staging = frame.staging;
auto& commandBuffer = frame.transferCommandBuffer;
auto& newSignalSemaphore = dataToCopy.transferCompleteSemaphore;
Expand All @@ -432,13 +432,13 @@ TransferTask::TransferResult TransferTask::_transferData(DataToCopy& dataToCopy)
log(level, " newSignalSemaphore = ", newSignalSemaphore, ", ", newSignalSemaphore ? newSignalSemaphore->vk() : VK_NULL_HANDLE);
log(level, " copyRegions.size() = ", copyRegions.size());

if (frame.waitOnFence && fence)
if (dataToCopy.waitOnTransferFence && fence)
{
uint64_t timeout = std::numeric_limits<uint64_t>::max();
if (VkResult result = fence->wait(timeout); result != VK_SUCCESS) return TransferResult{result, {}};
fence->resetFenceAndDependencies();
}
frame.waitOnFence = false;
dataToCopy.waitOnTransferFence = false;

// advance frameIndex
dataToCopy.frameIndex = (dataToCopy.frameIndex + 1) % dataToCopy.frames.size();
Expand Down Expand Up @@ -545,7 +545,7 @@ TransferTask::TransferResult TransferTask::_transferData(DataToCopy& dataToCopy)

result = transferQueue->submit(submitInfo, fence);

frame.waitOnFence = true;
dataToCopy.waitOnTransferFence = true;

dataToCopy.transferConsumerCompletedSemaphore.reset();

Expand Down
23 changes: 15 additions & 8 deletions src/vsg/vk/RenderPass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -333,18 +333,21 @@ ref_ptr<RenderPass> vsg::createRenderPass(Device* device, VkFormat imageFormat,
colorDependency.dstSubpass = 0;
colorDependency.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
colorDependency.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
colorDependency.srcAccessMask = 0;
colorDependency.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
colorDependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
colorDependency.dependencyFlags = 0;

// depth buffer is shared between swap chain images
SubpassDependency depthDependency = {};
depthDependency.srcSubpass = VK_SUBPASS_EXTERNAL;
depthDependency.dstSubpass = 0;
depthDependency.srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
depthDependency.dstStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
depthDependency.srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
depthDependency.dstStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
depthDependency.srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
depthDependency.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
depthDependency.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT |
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
depthDependency.dependencyFlags = 0;

RenderPass::Dependencies dependencies{colorDependency, depthDependency};
Expand Down Expand Up @@ -444,15 +447,19 @@ ref_ptr<RenderPass> vsg::createMultisampledRenderPass(Device* device, VkFormat i
dependency.dstSubpass = 0;
dependency.srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
dependency.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
dependency.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
dependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
dependency.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
dependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
dependency.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;

SubpassDependency dependency2 = {};
dependency2.srcSubpass = 0;
dependency2.dstSubpass = VK_SUBPASS_EXTERNAL;
dependency2.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
dependency2.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
dependency2.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
dependency2.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
dependency2.dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
dependency2.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
dependency2.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
Expand Down
Loading