wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Invalidate current pipeline when DSV format is changed.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-06-11 10:13:28 +02:00 committed by Alexandre Julliard
parent bc8c07ffcc
commit 3abfb840fd
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/vkd3d/command.c
View File

@ -2305,6 +2305,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCom
return E_NOTIMPL; return E_NOTIMPL;
} }
static bool d3d12_command_list_has_unknown_dsv_format(struct d3d12_command_list *list)
{
struct d3d12_graphics_pipeline_state *graphics;
if (!d3d12_pipeline_state_is_graphics(list->state))
return false;
graphics = &list->state->u.graphics;
return graphics->null_attachment_mask & (1u << graphics->rt_count);
}
static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list)
{ {
struct d3d12_graphics_pipeline_state *graphics; struct d3d12_graphics_pipeline_state *graphics;
@ -2312,8 +2323,7 @@ static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list
assert(d3d12_pipeline_state_is_graphics(list->state)); assert(d3d12_pipeline_state_is_graphics(list->state));
graphics = &list->state->u.graphics; graphics = &list->state->u.graphics;
return graphics->dsv_format return graphics->dsv_format || (d3d12_command_list_has_unknown_dsv_format(list) && list->dsv_format);
|| (graphics->null_attachment_mask & (1u << graphics->rt_count) && list->dsv_format);
} }
static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list, static void d3d12_command_list_get_fb_extent(struct d3d12_command_list *list,
@ -4321,6 +4331,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface);
const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_rtv_desc *rtv_desc;
const struct d3d12_dsv_desc *dsv_desc; const struct d3d12_dsv_desc *dsv_desc;
VkFormat prev_dsv_format;
struct vkd3d_view *view; struct vkd3d_view *view;
unsigned int i; unsigned int i;
@ -4373,6 +4384,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count);
} }
prev_dsv_format = list->dsv_format;
list->dsv = VK_NULL_HANDLE; list->dsv = VK_NULL_HANDLE;
list->dsv_format = VK_FORMAT_UNDEFINED; list->dsv_format = VK_FORMAT_UNDEFINED;
if (depth_stencil_descriptor) if (depth_stencil_descriptor)
@ -4402,6 +4414,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi
} }
} }
if (prev_dsv_format != list->dsv_format && d3d12_command_list_has_unknown_dsv_format(list))
d3d12_command_list_invalidate_current_pipeline(list);
d3d12_command_list_invalidate_current_framebuffer(list); d3d12_command_list_invalidate_current_framebuffer(list);
d3d12_command_list_invalidate_current_render_pass(list); d3d12_command_list_invalidate_current_render_pass(list);
} }