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

[dxvk] Add separate flag to forcibly end a render pass

Browse Source 
Otherwise, if the app binds the same set of render targets again,
the dirty framebuffer flag will get cleared.
This commit is contained in:
Philip Rebohle 2025-03-06 23:40:09 +01:00
parent 3558b4c3da
commit 6edcb70994
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dxvk/dxvk_context.cpp
View File

@ -387,7 +387,7 @@ namespace dxvk {
attachmentIndex = m_state.om.framebufferInfo.findAttachment(imageView); attachmentIndex = m_state.om.framebufferInfo.findAttachment(imageView);
// Need to interrupt the render pass if there are pending resolves // Need to interrupt the render pass if there are pending resolves
if (attachmentIndex < 0 || m_flags.test(DxvkContextFlag::GpDirtyFramebuffer)) { if (attachmentIndex < 0 || m_flags.test(DxvkContextFlag::GpRenderPassNeedsFlush)) {
// Suspend works here because we'll end up with one of these scenarios: // Suspend works here because we'll end up with one of these scenarios:
// 1) The render pass gets ended for good, in which case we emit barriers // 1) The render pass gets ended for good, in which case we emit barriers
// 2) The clear gets folded into render pass ops, so the layout is correct // 2) The clear gets folded into render pass ops, so the layout is correct
@ -2688,7 +2688,7 @@ namespace dxvk {
m_flags.set(DxvkContextFlag::GpDirtyMultisampleState); m_flags.set(DxvkContextFlag::GpDirtyMultisampleState);
if (!m_features.test(DxvkContextFeature::VariableMultisampleRate)) if (!m_features.test(DxvkContextFeature::VariableMultisampleRate))
m_flags.set(DxvkContextFlag::GpDirtyFramebuffer); m_flags.set(DxvkContextFlag::GpRenderPassNeedsFlush);
} }
DxvkRsInfo rsInfo( DxvkRsInfo rsInfo(
@ -3958,7 +3958,7 @@ namespace dxvk {
if (attachmentIndex >= 0 && !m_state.om.framebufferInfo.isWritable(attachmentIndex, aspect)) if (attachmentIndex >= 0 && !m_state.om.framebufferInfo.isWritable(attachmentIndex, aspect))
attachmentIndex = -1; attachmentIndex = -1;
if (attachmentIndex < 0 || m_flags.test(DxvkContextFlag::GpDirtyFramebuffer)) { if (attachmentIndex < 0) {
this->spillRenderPass(false); this->spillRenderPass(false);
this->prepareImage(imageView->image(), imageView->subresources()); this->prepareImage(imageView->image(), imageView->subresources());
@ -5203,7 +5203,7 @@ namespace dxvk {
resolve.stencilMode = stencilMode; resolve.stencilMode = stencilMode;
// Ensure resolves get flushed before the next draw // Ensure resolves get flushed before the next draw
m_flags.set(DxvkContextFlag::GpDirtyFramebuffer); m_flags.set(DxvkContextFlag::GpRenderPassNeedsFlush);
return true; return true;
} }
@ -5341,13 +5341,14 @@ namespace dxvk {
void DxvkContext::spillRenderPass(bool suspend) { void DxvkContext::spillRenderPass(bool suspend) {
if (m_flags.test(DxvkContextFlag::GpRenderPassBound)) { if (m_flags.test(DxvkContextFlag::GpRenderPassBound)) {
m_flags.clr(DxvkContextFlag::GpRenderPassBound, m_flags.clr(DxvkContextFlag::GpRenderPassBound,
DxvkContextFlag::GpRenderPassSideEffects); DxvkContextFlag::GpRenderPassSideEffects,
DxvkContextFlag::GpRenderPassNeedsFlush);
this->pauseTransformFeedback(); this->pauseTransformFeedback();
m_queryManager.endQueries(m_cmd, VK_QUERY_TYPE_OCCLUSION); m_queryManager.endQueries(m_cmd, VK_QUERY_TYPE_OCCLUSION);
m_queryManager.endQueries(m_cmd, VK_QUERY_TYPE_PIPELINE_STATISTICS); m_queryManager.endQueries(m_cmd, VK_QUERY_TYPE_PIPELINE_STATISTICS);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
popDebugRegion(util::DxvkDebugLabelType::InternalBarrierControl); popDebugRegion(util::DxvkDebugLabelType::InternalBarrierControl);
@ -6302,6 +6303,9 @@ namespace dxvk {
} }
m_flags.set(DxvkContextFlag::GpDirtyPipelineState); m_flags.set(DxvkContextFlag::GpDirtyPipelineState);
} else if (m_flags.test(DxvkContextFlag::GpRenderPassNeedsFlush)) {
// End render pass to flush pending resolves
this->spillRenderPass(true);
} }
} }
@ -6840,7 +6844,9 @@ namespace dxvk {
return false; return false;
} }
if (m_flags.test(DxvkContextFlag::GpDirtyFramebuffer)) // End render pass if there are pending resolves
if (m_flags.any(DxvkContextFlag::GpDirtyFramebuffer,
DxvkContextFlag::GpRenderPassNeedsFlush))
this->updateFramebuffer(); this->updateFramebuffer();
if (m_flags.test(DxvkContextFlag::GpXfbActive)) { if (m_flags.test(DxvkContextFlag::GpXfbActive)) {
@ -7751,7 +7757,7 @@ namespace dxvk {
m_state.om.renderingInfo.color[i].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; m_state.om.renderingInfo.color[i].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
} }
m_flags.set(DxvkContextFlag::GpDirtyFramebuffer); m_flags.set(DxvkContextFlag::GpRenderPassNeedsFlush);
} }
} }
} }

1
src/dxvk/dxvk_context_state.h
View File

@ -25,6 +25,7 @@ namespace dxvk {
GpRenderPassSuspended, ///< Render pass is currently suspended GpRenderPassSuspended, ///< Render pass is currently suspended
GpRenderPassSecondaryCmd, ///< Render pass uses secondary command buffer GpRenderPassSecondaryCmd, ///< Render pass uses secondary command buffer
GpRenderPassSideEffects, ///< Render pass has side effects GpRenderPassSideEffects, ///< Render pass has side effects
GpRenderPassNeedsFlush, ///< Render pass has pending resolves or discards
GpXfbActive, ///< Transform feedback is enabled GpXfbActive, ///< Transform feedback is enabled
GpDirtyFramebuffer, ///< Framebuffer binding is out of date GpDirtyFramebuffer, ///< Framebuffer binding is out of date
GpDirtyPipeline, ///< Graphics pipeline binding is out of date GpDirtyPipeline, ///< Graphics pipeline binding is out of date