Module: vkd3d Branch: master Commit: f15a0ace3efabe85441514dde3eb00824c2f24c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f15a0ace3efabe85441514dde3eb00...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Feb 19 16:57:32 2024 +0100
tests/shader_runner: Print a summary of the runner capabilities in run_shader_tests().
---
tests/shader_runner.c | 4 ++++ tests/shader_runner_d3d11.c | 2 -- tests/shader_runner_d3d12.c | 3 --- tests/shader_runner_gl.c | 3 --- tests/shader_runner_vulkan.c | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 4f5a04ef..bdf639e4 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1338,6 +1338,10 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_c const char *testname; FILE *f;
+ trace(" float64: %u.\n", caps->float64); + trace(" int64: %u.\n", caps->int64); + trace(" rov: %u.\n", caps->rov); + if (!test_options.filename) fatal_error("No filename specified.\n");
diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 7ca61109..5cd7340e 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -281,13 +281,11 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) hr = ID3D11Device_CheckFeatureSupport(runner->device, D3D11_FEATURE_DOUBLES, &doubles, sizeof(doubles)); ok(hr == S_OK, "Failed to check double precision feature support, hr %#lx.\n", hr); - trace("DoublePrecisionFloatShaderOps: %u.\n", doubles.DoublePrecisionFloatShaderOps); runner->caps.float64 = doubles.DoublePrecisionFloatShaderOps;
hr = ID3D11Device_CheckFeatureSupport(runner->device, D3D11_FEATURE_D3D11_OPTIONS2, &options2, sizeof(options2)); ok(hr == S_OK, "Got hr %#lx.\n", hr); - trace("ROVsSupported: %u.\n", options2.ROVsSupported); runner->caps.rov = options2.ROVsSupported;
rt_width = RENDER_TARGET_WIDTH; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 74ca9492..da6edbbd 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -627,11 +627,8 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner)
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)); ok(hr == S_OK, "Failed to check feature options support, hr %#x.\n", hr); - trace("DoublePrecisionFloatShaderOps: %u.\n", options.DoublePrecisionFloatShaderOps); - trace("ROVsSupported: %u.\n", options.ROVsSupported); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS1, &options1, sizeof(options1)); ok(hr == S_OK, "Failed to check feature options1 support, hr %#x.\n", hr); - trace("Int64ShaderOps: %u.\n", options1.Int64ShaderOps);
runner->caps.minimum_shader_model = SHADER_MODEL_4_0; runner->caps.maximum_shader_model = SHADER_MODEL_5_1; diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index fedb20e7..906a70aa 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -246,9 +246,6 @@ static bool gl_runner_init(struct gl_runner *runner) trace("GL_RENDERER: %s\n", glGetString(GL_RENDERER)); trace(" GL_VERSION: %s\n", glGetString(GL_VERSION));
- trace(" float64: %u.\n", runner->caps.float64); - trace(" int64: %u.\n", runner->caps.int64); - p_glSpecializeShader = (void *)eglGetProcAddress("glSpecializeShader");
glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_NOTIFICATION, 0, NULL, GL_FALSE); diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index c1b167eb..56407fbf 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1375,13 +1375,11 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) ENABLE_FEATURE(shaderImageGatherExtended); ENABLE_FEATURE(shaderStorageImageWriteWithoutFormat);
- trace("shaderFloat64: %u.\n", ret_features.shaderFloat64); if (ret_features.shaderFloat64) { features.shaderFloat64 = VK_TRUE; runner->caps.float64 = true; } - trace("shaderInt64: %u.\n", ret_features.shaderInt64); if (ret_features.shaderInt64) { features.shaderInt64 = VK_TRUE;