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/shader-runner: Skip shader model 6.0 tests if the device does not support them.

Browse Source
This commit is contained in:
Conor McCarthy 2024-04-24 10:51:11 +10:00 committed by Alexandre Julliard
parent fd590c2593
commit 9315bcb6a1
Notes: Alexandre Julliard 2024-05-02 22:40:21 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/800
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/shader_runner_d3d12.c
View File

@ -753,6 +753,16 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner)
runner->caps.rov = options.ROVsSupported; runner->caps.rov = options.ROVsSupported;
} }
static bool device_supports_shader_model_6_0(ID3D12Device *device)
{
D3D12_FEATURE_DATA_SHADER_MODEL sm = {D3D_SHADER_MODEL_6_0};
HRESULT hr;
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &sm, sizeof(sm));
ok(hr == S_OK, "Failed to check feature shader model support, hr %#x.\n", hr);
return sm.HighestShaderModel >= D3D_SHADER_MODEL_6_0;
}
void run_shader_tests_d3d12(void *dxc_compiler) void run_shader_tests_d3d12(void *dxc_compiler)
{ {
static const struct test_context_desc desc = static const struct test_context_desc desc =
@ -792,7 +802,11 @@ void run_shader_tests_d3d12(void *dxc_compiler)
{ {
runner.caps.minimum_shader_model = SHADER_MODEL_6_0; runner.caps.minimum_shader_model = SHADER_MODEL_6_0;
runner.caps.maximum_shader_model = SHADER_MODEL_6_0; runner.caps.maximum_shader_model = SHADER_MODEL_6_0;
if (device_supports_shader_model_6_0(device))
run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler);
else
trace("Device does not support shader model 6.0.\n");
} }
ID3D12GraphicsCommandList_Release(runner.compute_list); ID3D12GraphicsCommandList_Release(runner.compute_list);