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

tests: Check that depth/stencil formats are supported before using them.

Browse Source 
This fixes a crash with the Qualcomm proprietary driver on an Adreno 540
GPU on my OnePlus 5 phone.
This commit is contained in:
Giovanni Mascellani 2024-06-01 21:39:04 +02:00 committed by Henri Verbeet
parent 9f056f3989
commit 3ff8130566
Notes: Henri Verbeet 2024-07-08 18:55:29 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/919
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/d3d12.c
View File

@ -547,6 +547,19 @@ static bool is_typed_uav_format_supported(ID3D12Device *device, DXGI_FORMAT form
return format_support.Support1 & D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; return format_support.Support1 & D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW;
} }
static bool is_ds_format_supported(ID3D12Device *device, DXGI_FORMAT format)
{
D3D12_FEATURE_DATA_FORMAT_SUPPORT format_support = {0};
HRESULT hr;
format_support.Format = format;
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT,
&format_support, sizeof(format_support));
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
return format_support.Support1 & D3D12_FORMAT_SUPPORT1_DEPTH_STENCIL;
}
static bool are_unaligned_block_textures_supported(ID3D12Device *device) static bool are_unaligned_block_textures_supported(ID3D12Device *device)
{ {
D3D12_FEATURE_DATA_D3D12_OPTIONS8 options; D3D12_FEATURE_DATA_D3D12_OPTIONS8 options;
@ -21021,11 +21034,12 @@ static void test_depth_stencil_sampling(void)
DXGI_FORMAT depth_view_format; DXGI_FORMAT depth_view_format;
DXGI_FORMAT stencil_view_format; DXGI_FORMAT stencil_view_format;
bool is_mvk_bug; bool is_mvk_bug;
bool is_qualcomm_todo;
} }
tests[] = tests[] =
{ {
{DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_D32_FLOAT_S8X24_UINT, {DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, DXGI_FORMAT_X32_TYPELESS_G8X24_UINT}, DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, DXGI_FORMAT_X32_TYPELESS_G8X24_UINT, false, true},
{DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, {DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT,
DXGI_FORMAT_R32_FLOAT}, DXGI_FORMAT_R32_FLOAT},
{DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT,
@ -21117,8 +21131,19 @@ static void test_depth_stencil_sampling(void)
for (i = 0; i < ARRAY_SIZE(tests); ++i) for (i = 0; i < ARRAY_SIZE(tests); ++i)
{ {
bool supported = is_ds_format_supported(device, tests[i].dsv_format);
vkd3d_test_push_context("Test %u", i); vkd3d_test_push_context("Test %u", i);
todo_if(tests[i].is_qualcomm_todo && is_qualcomm_device(device))
ok(supported, "Depth/stencil format %#x is not supported.\n", tests[i].dsv_format);
if (!supported)
{
vkd3d_test_pop_context();
continue;
}
reset_command_list(command_list, context.allocator); reset_command_list(command_list, context.allocator);
init_depth_stencil(&ds, device, context.render_target_desc.Width, init_depth_stencil(&ds, device, context.render_target_desc.Width,