[PATCH 0/3] MR13: tests: Various fixes.

[PATCH 1/3] tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in test_bufinfo_instruction().

[Zebediah Figura]

From: Zebediah Figura

---
 tests/d3d12.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index 9fc199bc..531ea1a4 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -34655,6 +34655,8 @@ static void test_bufinfo_instruction(void)
                 D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);
         check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &test->expected_result);
         reset_command_list(command_list, context.allocator);
+        transition_resource_state(command_list, context.render_target,
+                D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET);

ID3D12Resource_Release(buffer);
     }

[PATCH 2/3] tests: Mark test_hull_shader_relative_addressing() as broken on radv.

[Zebediah Figura]

From: Zebediah Figura

Broken for me with "AMD Radeon RX 560 Series (RADV POLARIS11)" (1002:67ef) but works with llvmpipe; Mesa 22.2.0-rc3.
---
 tests/d3d12.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index 531ea1a4..89bfab79 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -35338,7 +35338,7 @@ static void test_hull_shader_relative_addressing(void)
     transition_resource_state(command_list, so_buffer,
             D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE);
     get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list);
-    check_triangles(&rb.rb, &expected_triangle, 1);
+    bug_if(is_radv_device(context.device)) check_triangles(&rb.rb, &expected_triangle, 1);
     release_resource_readback(&rb);

ID3D12Resource_Release(so_buffer);

[PATCH 3/3] tests: Check for failure from init_test_context() in the d3d11 runner.

[Zebediah Figura]

From: Zebediah Figura

---
 tests/shader_runner_d3d11.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c
index 8999622d..2314f6d7 100644
--- a/tests/shader_runner_d3d11.c
+++ b/tests/shader_runner_d3d11.c
@@ -627,9 +627,11 @@ void run_shader_tests_d3d11(int argc, char **argv)
         parse_args(argc, argv);
         enable_d3d11_debug_layer(argc, argv);
         init_adapter_info();
-        init_test_context(&runner);
-        run_shader_tests(&runner.r, argc, argv, &d3d11_runner_ops);
-        destroy_test_context(&runner);
+        if (init_test_context(&runner))
+        {
+            run_shader_tests(&runner.r, argc, argv, &d3d11_runner_ops);
+            destroy_test_context(&runner);
+        }
     }
     FreeLibrary(d3d11_module);
     FreeLibrary(dxgi_module);

[PATCH 0/3] MR13: tests: Various fixes. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.