wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader_runner: Allow selecting the compiler.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-03-06 21:45:24 +01:00
committed by Henri Verbeet
parent 5a898254b0
commit d34f5fbae2
Notes: Henri Verbeet 2025-03-10 15:23:30 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Giovanni Mascellani (@giomasce)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1407
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/shader_runner.c
View File

@@ -70,6 +70,7 @@ static struct shader_test_options
const char *filename; const char *filename;
enum shader_model minimum_shader_model, maximum_shader_model; enum shader_model minimum_shader_model, maximum_shader_model;
const char *executor_filter; const char *executor_filter;
const char *compiler_filter;
} shader_test_options = {0}; } shader_test_options = {0};
#ifdef VKD3D_CROSSTEST #ifdef VKD3D_CROSSTEST
@@ -2098,6 +2099,15 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c
return; return;
} }
if (shader_test_options.compiler_filter
&& strcmp(shader_test_options.compiler_filter, compiler_string))
{
trace("Skipping compiling shaders with %s and executing with %s "
"because of the executor filter\n",
compiler_string, caps->runner);
return;
}
minimum_shader_model = max(caps->minimum_shader_model, shader_test_options.minimum_shader_model); minimum_shader_model = max(caps->minimum_shader_model, shader_test_options.minimum_shader_model);
maximum_shader_model = min(caps->maximum_shader_model, shader_test_options.maximum_shader_model); maximum_shader_model = min(caps->maximum_shader_model, shader_test_options.maximum_shader_model);
@@ -2641,6 +2651,8 @@ static inline void parse_shader_test_args(int argc, char **argv)
parse_shader_model(argv[++i], &shader_test_options.maximum_shader_model); parse_shader_model(argv[++i], &shader_test_options.maximum_shader_model);
else if (!strcmp(argv[i], "--filter-executor")) else if (!strcmp(argv[i], "--filter-executor"))
shader_test_options.executor_filter = argv[++i]; shader_test_options.executor_filter = argv[++i];
else if (!strcmp(argv[i], "--filter-compiler"))
shader_test_options.compiler_filter = argv[++i];
else if (argv[i][0] != '-') else if (argv[i][0] != '-')
shader_test_options.filename = argv[i]; shader_test_options.filename = argv[i];
} }
@@ -2664,6 +2676,9 @@ START_TEST(shader_runner)
if (shader_test_options.executor_filter) if (shader_test_options.executor_filter)
trace("Running shaders with executor %s\n", shader_test_options.executor_filter); trace("Running shaders with executor %s\n", shader_test_options.executor_filter);
if (shader_test_options.compiler_filter)
trace("Running shaders with compiler %s\n", shader_test_options.compiler_filter);
dxc = dxcompiler_create(); dxc = dxcompiler_create();
trace("Running HLSL compile tests.\n"); trace("Running HLSL compile tests.\n");