=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d: Skip uninitialized DSV and RTV descriptors.
Alexandre Julliard
julliard at winehq.org
Tue Nov 27 14:25:54 CST 2018
Module: vkd3d
Branch: master
Commit: 1e2070837bc32f9a9fc09dc0a60ef6d7f6506e65
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e2070837bc32f9a9fc09dc0a60ef6d7f6506e65
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Nov 27 17:04:34 2018 +0100
vkd3d: Skip uninitialized DSV and RTV descriptors.
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 | 43 +++++++++++++++++++++++++++++++------------
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 9e5921e..3d5e898 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3570,9 +3570,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
for (i = 0; i < render_target_descriptor_count; ++i)
{
if (single_descriptor_handle)
- rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors) + i;
+ {
+ if ((rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors)))
+ rtv_desc += i;
+ }
else
+ {
rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]);
+ }
+
+ if (!rtv_desc)
+ {
+ WARN("RTV descriptor %u is not initialized.\n", i);
+ list->views[i + 1] = VK_NULL_HANDLE;
+ continue;
+ }
d3d12_command_list_track_resource_usage(list, rtv_desc->resource);
@@ -3591,21 +3603,28 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
if (depth_stencil_descriptor)
{
- dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor);
+ if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor)))
+ {
+ d3d12_command_list_track_resource_usage(list, dsv_desc->resource);
- d3d12_command_list_track_resource_usage(list, dsv_desc->resource);
+ /* In D3D12 CPU descriptors are consumed when a command is recorded. */
+ view = dsv_desc->view;
+ if (!d3d12_command_allocator_add_view(list->allocator, view))
+ {
+ WARN("Failed to add view.\n");
+ list->views[0] = VK_NULL_HANDLE;
+ }
- /* In D3D12 CPU descriptors are consumed when a command is recorded. */
- view = dsv_desc->view;
- if (!d3d12_command_allocator_add_view(list->allocator, view))
+ list->views[0] = view->u.vk_image_view;
+ list->fb_width = max(list->fb_width, dsv_desc->width);
+ list->fb_height = max(list->fb_height, dsv_desc->height);
+ list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count);
+ }
+ else
{
- WARN("Failed to add view.\n");
+ WARN("DSV descriptor is not initialized.\n");
+ list->views[0] = VK_NULL_HANDLE;
}
-
- list->views[0] = view->u.vk_image_view;
- list->fb_width = max(list->fb_width, dsv_desc->width);
- list->fb_height = max(list->fb_height, dsv_desc->height);
- list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count);
}
d3d12_command_list_invalidate_current_framebuffer(list);
More information about the wine-cvs
mailing list