From 8446c28de1a024fb3318fa8047cadebaade2e856 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 13 Oct 2019 01:35:06 +0200 Subject: [PATCH] [dxvk] Remove spill parameter from bindRenderTargets No longer needed. --- src/d3d11/d3d11_context.cpp | 2 +- src/d3d11/d3d11_swapchain.cpp | 2 +- src/dxvk/dxvk_context.cpp | 6 +----- src/dxvk/dxvk_context.h | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp index 325b733d..455aaf0c 100644 --- a/src/d3d11/d3d11_context.cpp +++ b/src/d3d11/d3d11_context.cpp @@ -3428,7 +3428,7 @@ namespace dxvk { EmitCs([ cAttachments = std::move(attachments) ] (DxvkContext* ctx) { - ctx->bindRenderTargets(cAttachments, false); + ctx->bindRenderTargets(cAttachments); }); } diff --git a/src/d3d11/d3d11_swapchain.cpp b/src/d3d11/d3d11_swapchain.cpp index 372d43c3..875bf036 100644 --- a/src/d3d11/d3d11_swapchain.cpp +++ b/src/d3d11/d3d11_swapchain.cpp @@ -264,7 +264,7 @@ namespace dxvk { DxvkRenderTargets renderTargets; renderTargets.color[0].view = m_imageViews.at(imageIndex); renderTargets.color[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - m_context->bindRenderTargets(renderTargets, false); + m_context->bindRenderTargets(renderTargets); VkViewport viewport; viewport.x = 0.0f; diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp index 0c4c19df..ad297bb7 100644 --- a/src/dxvk/dxvk_context.cpp +++ b/src/dxvk/dxvk_context.cpp @@ -96,8 +96,7 @@ namespace dxvk { void DxvkContext::bindRenderTargets( - const DxvkRenderTargets& targets, - bool spill) { + const DxvkRenderTargets& targets) { // If necessary, perform clears on the active render targets if (m_flags.test(DxvkContextFlag::GpClearRenderTargets)) this->clearRenderPass(); @@ -118,9 +117,6 @@ namespace dxvk { // the same render targets are bound again m_flags.clr(DxvkContextFlag::GpDirtyFramebuffer); } - - if (spill) - this->spillRenderPass(); } diff --git a/src/dxvk/dxvk_context.h b/src/dxvk/dxvk_context.h index 940d9482..e1042467 100644 --- a/src/dxvk/dxvk_context.h +++ b/src/dxvk/dxvk_context.h @@ -78,11 +78,9 @@ namespace dxvk { * \c spill flag in order to make shader writes * from previous rendering operations visible. * \param [in] targets Render targets to bind - * \param [in] spill Spill render pass if true */ void bindRenderTargets( - const DxvkRenderTargets& targets, - bool spill); + const DxvkRenderTargets& targets); /** * \brief Binds indirect argument buffer