=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: libs/vkd3d: Fix single descriptor handles in d3d12_command_list_OMSetRenderTargets().
Alexandre Julliard
julliard at winehq.org
Tue Feb 13 13:25:08 CST 2018
Module: vkd3d
Branch: master
Commit: abcd0348a088de64772fb517170aee383beac2b2
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abcd0348a088de64772fb517170aee383beac2b2
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Feb 13 13:15:01 2018 +0100
libs/vkd3d: Fix single descriptor handles in d3d12_command_list_OMSetRenderTargets().
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/command.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 4273a66..847581c 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3372,6 +3372,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
BOOL single_descriptor_handle, const D3D12_CPU_DESCRIPTOR_HANDLE *depth_stencil_descriptor)
{
struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface);
+ const struct d3d12_rtv_desc *rtv_desc;
+ const struct d3d12_dsv_desc *dsv_desc;
unsigned int i;
TRACE("iface %p, render_target_descriptor_count %u, render_target_descriptors %p, "
@@ -3390,7 +3392,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
list->fb_height = 0;
for (i = 0; i < render_target_descriptor_count; ++i)
{
- const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]);
+ if (single_descriptor_handle)
+ rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors) + i;
+ else
+ rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]);
d3d12_command_list_track_resource_usage(list, rtv_desc->resource);
@@ -3403,7 +3408,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
if (depth_stencil_descriptor)
{
- const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor);
+ dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor);
d3d12_command_list_track_resource_usage(list, dsv_desc->resource);
More information about the wine-cvs
mailing list