rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-01 09:25:24 +02:00
Code Issues Projects Releases Wiki Activity

[dxvk] Fix some prepareImage inconsistencies

Browse Source 
Need to check the real subresources since most functions operate
on those. Only semi-relevant for multi-planar and 3D images.
This commit is contained in:
Philip Rebohle 2025-03-24 03:38:48 +01:00
parent a0e6ca3cc0
commit c421560da9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dxvk/dxvk_context.cpp
View File

@ -402,7 +402,7 @@ namespace dxvk {
// will indirectly emit barriers for the given render target. // will indirectly emit barriers for the given render target.
// If there is overlap, we need to explicitly transition affected attachments. // If there is overlap, we need to explicitly transition affected attachments.
this->spillRenderPass(true); this->spillRenderPass(true);
this->prepareImage(imageView->image(), imageView->subresources(), false); this->prepareImage(imageView->image(), imageView->imageSubresources(), false);
} else if (!m_state.om.framebufferInfo.isWritable(attachmentIndex, clearAspects)) { } else if (!m_state.om.framebufferInfo.isWritable(attachmentIndex, clearAspects)) {
// We cannot inline clears if the clear aspects are not writable. End the // We cannot inline clears if the clear aspects are not writable. End the
// render pass on the next draw to ensure that the image gets cleared. // render pass on the next draw to ensure that the image gets cleared.
@ -4141,7 +4141,7 @@ namespace dxvk {
if (attachmentIndex < 0) { if (attachmentIndex < 0) {
this->spillRenderPass(false); this->spillRenderPass(false);
this->prepareImage(imageView->image(), imageView->subresources()); this->prepareImage(imageView->image(), imageView->imageSubresources());
this->flushPendingAccesses(*imageView->image(), imageView->imageSubresources(), DxvkAccess::Write); this->flushPendingAccesses(*imageView->image(), imageView->imageSubresources(), DxvkAccess::Write);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) { if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) {
@ -4246,7 +4246,7 @@ namespace dxvk {
spillRenderPass(false); spillRenderPass(false);
invalidateState(); invalidateState();
prepareImage(imageView->image(), imageView->subresources()); prepareImage(imageView->image(), imageView->imageSubresources());
flushPendingAccesses(*imageView->image(), imageView->imageSubresources(), DxvkAccess::Write); flushPendingAccesses(*imageView->image(), imageView->imageSubresources(), DxvkAccess::Write);
cmdBuffer = DxvkCmdBuffer::ExecBuffer; cmdBuffer = DxvkCmdBuffer::ExecBuffer;
@ -6721,7 +6721,7 @@ namespace dxvk {
const DxvkAttachment& attachment = m_state.om.framebufferInfo.getColorTarget(i); const DxvkAttachment& attachment = m_state.om.framebufferInfo.getColorTarget(i);
if (attachment.view != nullptr && attachment.view->image() == image if (attachment.view != nullptr && attachment.view->image() == image
&& (is3D || vk::checkSubresourceRangeOverlap(attachment.view->subresources(), subresources))) { && (is3D || vk::checkSubresourceRangeOverlap(attachment.view->imageSubresources(), subresources))) {
this->transitionColorAttachment(attachment, m_rtLayouts.color[i]); this->transitionColorAttachment(attachment, m_rtLayouts.color[i]);
m_rtLayouts.color[i] = image->info().layout; m_rtLayouts.color[i] = image->info().layout;
} }
@ -6730,7 +6730,7 @@ namespace dxvk {
const DxvkAttachment& attachment = m_state.om.framebufferInfo.getDepthTarget(); const DxvkAttachment& attachment = m_state.om.framebufferInfo.getDepthTarget();
if (attachment.view != nullptr && attachment.view->image() == image if (attachment.view != nullptr && attachment.view->image() == image
&& (is3D || vk::checkSubresourceRangeOverlap(attachment.view->subresources(), subresources))) { && (is3D || vk::checkSubresourceRangeOverlap(attachment.view->imageSubresources(), subresources))) {
this->transitionDepthAttachment(attachment, m_rtLayouts.depth); this->transitionDepthAttachment(attachment, m_rtLayouts.depth);
m_rtLayouts.depth = image->info().layout; m_rtLayouts.depth = image->info().layout;
} }