From cd674539fd4490fd9730a20d907cc683cbb596f9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 18 Mar 2020 12:38:15 +0000 Subject: [PATCH] Change shader debugging tests to check at runtime if it's available * The config values can be loaded in the tests now. --- util/test/tests/D3D12/D3D12_PrimitiveID.py | 7 ++++--- util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py | 6 +++--- util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/util/test/tests/D3D12/D3D12_PrimitiveID.py b/util/test/tests/D3D12/D3D12_PrimitiveID.py index bae5f68ab..7782a3b3d 100644 --- a/util/test/tests/D3D12/D3D12_PrimitiveID.py +++ b/util/test/tests/D3D12/D3D12_PrimitiveID.py @@ -6,9 +6,6 @@ import rdtest class D3D12_PrimitiveID(rdtest.TestCase): demos_test_name = 'D3D12_PrimitiveID' - def check_support(self): - return False, 'shader debugging is not yet enabled for D3D12' - def test_draw(self, draw: rd.DrawcallDescription, x, y, prim, expected_prim, expected_output): self.controller.SetFrameEvent(draw.eventId, True) pipe: rd.PipeState = self.controller.GetPipelineState() @@ -50,6 +47,10 @@ class D3D12_PrimitiveID(rdtest.TestCase): return True def check_capture(self): + if not self.controller.GetAPIProperties().shaderDebugging: + rdtest.log.success("Shader debugging not enabled, skipping test") + return + success = True # Jump to the draw diff --git a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py index 5f767ce88..3fd430e59 100644 --- a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py @@ -6,9 +6,6 @@ import rdtest class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): demos_test_name = 'D3D12_Resource_Mapping_Zoo' - def check_support(self): - return False, 'shader debugging is not yet enabled for D3D12' - def test_debug_pixel(self, x, y, test_name): pipe: rd.PipeState = self.controller.GetPipelineState() @@ -34,6 +31,9 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): return True def check_capture(self): + if not self.controller.GetAPIProperties().shaderDebugging: + rdtest.log.success("Shader debugging not enabled, skipping test") + return failed = False diff --git a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py index 711cafe64..986e3fbaa 100644 --- a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py @@ -6,10 +6,10 @@ import rdtest class D3D12_Shader_Debug_Zoo(rdtest.TestCase): demos_test_name = 'D3D12_Shader_Debug_Zoo' - def check_support(self): - return False, 'shader debugging is not yet enabled for D3D12' - def check_capture(self): + if not self.controller.GetAPIProperties().shaderDebugging: + rdtest.log.success("Shader debugging not enabled, skipping test") + return failed = False