wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader_runner: Use SHADER_MODEL_MAX to represent the maxium supported shader model.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-10-24 22:16:39 +02:00
committed by Henri Verbeet
parent b93fceb6a5
commit d380bc196f
Notes: Henri Verbeet 2025-11-24 19:12:37 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1812
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/shader_runner_d3d12.c
View File

@@ -1247,7 +1247,7 @@ void run_shader_tests_d3d12(void *dxc_compiler)
#endif #endif
bool skip_sm4 = test_skipping_execution(executor, HLSL_COMPILER, SHADER_MODEL_4_0, SHADER_MODEL_5_1); bool skip_sm4 = test_skipping_execution(executor, HLSL_COMPILER, SHADER_MODEL_4_0, SHADER_MODEL_5_1);
bool skip_sm6 = test_skipping_execution(executor, "dxcompiler", SHADER_MODEL_6_0, SHADER_MODEL_6_2); bool skip_sm6 = test_skipping_execution(executor, "dxcompiler", SHADER_MODEL_6_0, SHADER_MODEL_MAX);
if (skip_sm4 && skip_sm6) if (skip_sm4 && skip_sm6)
return; return;
@@ -1259,5 +1259,5 @@ void run_shader_tests_d3d12(void *dxc_compiler)
run_shader_tests_for_model_range(NULL, SHADER_MODEL_4_0, SHADER_MODEL_5_1); run_shader_tests_for_model_range(NULL, SHADER_MODEL_4_0, SHADER_MODEL_5_1);
if (dxc_compiler && !skip_sm6) if (dxc_compiler && !skip_sm6)
run_shader_tests_for_model_range(dxc_compiler, SHADER_MODEL_6_0, SHADER_MODEL_6_2); run_shader_tests_for_model_range(dxc_compiler, SHADER_MODEL_6_0, SHADER_MODEL_MAX);
} }

4
tests/shader_runner_metal.m
View File

@@ -1221,7 +1221,7 @@ static void metal_runner_cleanup(struct metal_runner *runner)
void run_shader_tests_metal(void *dxc_compiler) void run_shader_tests_metal(void *dxc_compiler)
{ {
bool skip_sm4 = test_skipping_execution("Metal", HLSL_COMPILER, SHADER_MODEL_4_0, SHADER_MODEL_5_1); bool skip_sm4 = test_skipping_execution("Metal", HLSL_COMPILER, SHADER_MODEL_4_0, SHADER_MODEL_5_1);
bool skip_sm6 = test_skipping_execution("Metal", "dxcompiler", SHADER_MODEL_6_0, SHADER_MODEL_6_2); bool skip_sm6 = test_skipping_execution("Metal", "dxcompiler", SHADER_MODEL_6_0, SHADER_MODEL_MAX);
struct metal_runner runner; struct metal_runner runner;
if (skip_sm4 && skip_sm6) if (skip_sm4 && skip_sm6)
@@ -1242,7 +1242,7 @@ void run_shader_tests_metal(void *dxc_compiler)
{ {
runner.caps.compiler = "dxcompiler"; runner.caps.compiler = "dxcompiler";
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_2; runner.caps.maximum_shader_model = SHADER_MODEL_MAX;
run_shader_tests(&runner.r, &runner.caps, &metal_runner_ops, dxc_compiler); run_shader_tests(&runner.r, &runner.caps, &metal_runner_ops, dxc_compiler);
} }