mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dxvk] Add feedback loop aspect flags to bindRenderTargets

This commit is contained in:
Joshua Ashton 2022-08-05 23:09:40 +00:00 committed by Joshie
parent dff514c924
commit 31d17efb48
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_context.cpp
View File

@ -3161,7 +3161,7 @@ namespace dxvk {
EmitCs([
cAttachments = std::move(attachments)
] (DxvkContext* ctx) mutable {
ctx->bindRenderTargets(Forwarder::move(cAttachments));
ctx->bindRenderTargets(Forwarder::move(cAttachments), 0u);
});
// If necessary, update push constant for the sample count
@ -3813,7 +3813,7 @@ namespace dxvk {
cUsedBindings = GetMaxUsedBindings()
] (DxvkContext* ctx) {
// Reset render targets
ctx->bindRenderTargets(DxvkRenderTargets());
ctx->bindRenderTargets(DxvkRenderTargets(), 0u);
// Reset vertex input state
ctx->setInputLayout(0, nullptr, 0, nullptr);

4
src/d3d11/d3d11_video.cpp
View File

@ -1198,7 +1198,7 @@ namespace dxvk {
rt.color[0].view = cView;
rt.color[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
ctx->bindRenderTargets(std::move(rt));
ctx->bindRenderTargets(std::move(rt), 0u);
ctx->bindShader(VK_SHADER_STAGE_VERTEX_BIT, Rc<DxvkShader>(m_vs));
ctx->bindShader(VK_SHADER_STAGE_FRAGMENT_BIT, Rc<DxvkShader>(m_fs));
ctx->bindResourceBuffer(VK_SHADER_STAGE_FRAGMENT_BIT, 0, DxvkBufferSlice(m_ubo));
@ -1312,7 +1312,7 @@ namespace dxvk {
void D3D11VideoContext::UnbindResources() {
m_ctx->EmitCs([this] (DxvkContext* ctx) {
ctx->bindRenderTargets(DxvkRenderTargets());
ctx->bindRenderTargets(DxvkRenderTargets(), 0u);
ctx->bindShader(VK_SHADER_STAGE_VERTEX_BIT, nullptr);
ctx->bindShader(VK_SHADER_STAGE_FRAGMENT_BIT, nullptr);

2
src/d3d9/d3d9_device.cpp
View File

@ -5465,7 +5465,7 @@ namespace dxvk {
EmitCs([
cAttachments = std::move(attachments)
] (DxvkContext* ctx) mutable {
ctx->bindRenderTargets(std::move(cAttachments));
ctx->bindRenderTargets(std::move(cAttachments), 0u);
});
}

8
src/dxvk/dxvk_context.h
View File

@ -87,10 +87,16 @@ namespace dxvk {
* \param [in] targets Render targets to bind
*/
void bindRenderTargets(
DxvkRenderTargets&& targets) {
DxvkRenderTargets&& targets,
VkImageAspectFlags feedbackLoop) {
// Set up default render pass ops
m_state.om.renderTargets = std::move(targets);
if (unlikely(m_state.gp.state.om.feedbackLoop() != feedbackLoop)) {
m_state.gp.state.om.setFeedbackLoop(feedbackLoop);
m_flags.set(DxvkContextFlag::GpDirtyPipelineState);
}
this->resetRenderPassOps(
m_state.om.renderTargets,
m_state.om.renderPassOps);

2
src/dxvk/dxvk_swapchain_blitter.cpp
View File

@ -180,7 +180,7 @@ namespace dxvk {
renderTargets.color[0].view = dstView;
renderTargets.color[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
ctx->bindRenderTargets(std::move(renderTargets));
ctx->bindRenderTargets(std::move(renderTargets), 0u);
VkExtent2D dstExtent = {
dstView->imageInfo().extent.width,