From d380bc196f46e3d6ae8759634b115ea50e36d903 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Fri, 24 Oct 2025 22:16:39 +0200 Subject: [PATCH] tests/shader_runner: Use SHADER_MODEL_MAX to represent the maxium supported shader model. --- tests/shader_runner_d3d12.c | 4 ++-- tests/shader_runner_metal.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index c9982cd06..ffd0834b2 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -1247,7 +1247,7 @@ void run_shader_tests_d3d12(void *dxc_compiler) #endif 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) 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); 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); } diff --git a/tests/shader_runner_metal.m b/tests/shader_runner_metal.m index c7828e17f..7a2f6ce70 100644 --- a/tests/shader_runner_metal.m +++ b/tests/shader_runner_metal.m @@ -1221,7 +1221,7 @@ static void metal_runner_cleanup(struct metal_runner *runner) 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_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; if (skip_sm4 && skip_sm6) @@ -1242,7 +1242,7 @@ void run_shader_tests_metal(void *dxc_compiler) { runner.caps.compiler = "dxcompiler"; 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); }