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

[dxvk] Fix potential issues in invalidateImageWithUsage

Browse Source 
Relevant for image recreation in D3D9, not so much for defrag
since we do everything late in the command list anyway.
This commit is contained in:
Philip Rebohle 2024-10-24 19:00:26 +02:00 committed by Philip Rebohle
parent 1a4ac219ed
commit 3268bda4a2
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/dxvk/dxvk_context.cpp
View File

@ -1429,9 +1429,6 @@ namespace dxvk {
void DxvkContext::invalidateImage( void DxvkContext::invalidateImage(
const Rc<DxvkImage>& image, const Rc<DxvkImage>& image,
Rc<DxvkResourceAllocation>&& slice) { Rc<DxvkResourceAllocation>&& slice) {
// Ensure image is in the correct layout and not currently tracked
prepareImage(image, image->getAvailableSubresources());
invalidateImageWithUsage(image, std::move(slice), DxvkImageUsageInfo()); invalidateImageWithUsage(image, std::move(slice), DxvkImageUsageInfo());
} }
@ -1440,28 +1437,43 @@ namespace dxvk {
const Rc<DxvkImage>& image, const Rc<DxvkImage>& image,
Rc<DxvkResourceAllocation>&& slice, Rc<DxvkResourceAllocation>&& slice,
const DxvkImageUsageInfo& usageInfo) { const DxvkImageUsageInfo& usageInfo) {
VkImageUsageFlags usage = image->info().usage;
// Invalidate active image descriptors
if (usage & (VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT))
m_descriptorState.dirtyViews(image->getShaderStages());
// Ensure that the image is in its default layout before invalidation
// and is not being tracked by the render pass layout logic. This does
// assume that the new backing storage is also in the default layout.
if (usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) {
bool found = false;
for (uint32_t i = 0; i < m_state.om.framebufferInfo.numAttachments() && !found; i++)
found = m_state.om.framebufferInfo.getAttachment(i).view->image() == image;
if (found)
m_flags.set(DxvkContextFlag::GpDirtyFramebuffer);
spillRenderPass(true);
prepareImage(image, image->getAvailableSubresources());
}
// If the image has any pending layout transitions, flush them accordingly.
// There might be false positives here, but those do not affect correctness.
if (resourceHasAccess(*image, image->getAvailableSubresources(), DxvkAccess::Write)) {
spillRenderPass(true);
flushBarriers();
}
// Actually replace backing storage and make sure to keep the old one alive
Rc<DxvkResourceAllocation> prevAllocation = image->assignStorageWithUsage(std::move(slice), usageInfo); Rc<DxvkResourceAllocation> prevAllocation = image->assignStorageWithUsage(std::move(slice), usageInfo);
m_cmd->track(std::move(prevAllocation)); m_cmd->track(std::move(prevAllocation));
if (usageInfo.stableGpuAddress) if (usageInfo.stableGpuAddress)
m_common->memoryManager().lockResourceGpuAddress(image->storage()); m_common->memoryManager().lockResourceGpuAddress(image->storage());
VkImageUsageFlags usage = image->info().usage;
if (usage & (VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT))
m_descriptorState.dirtyViews(image->getShaderStages());
if (usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) {
// Interrupt the current render pass if the image is bound for rendering
for (uint32_t i = 0; i < m_state.om.framebufferInfo.numAttachments(); i++) {
if (m_state.om.framebufferInfo.getAttachment(i).view->image() == image) {
this->spillRenderPass(false);
m_flags.set(DxvkContextFlag::GpDirtyFramebuffer);
break;
}
}
}
} }