diff --git a/util/test/rdtest/logging.py b/util/test/rdtest/logging.py index 183c25beb..09e023010 100644 --- a/util/test/rdtest/logging.py +++ b/util/test/rdtest/logging.py @@ -7,7 +7,7 @@ import mimetypes import threading import difflib import shutil -from typing import IO, Any, List, Type +from typing import IO, Any, Callable, List, Type from . import util @@ -29,6 +29,7 @@ class TestLogger: def __init__(self): self.indentation = 0 self.test_name = '' + self.ctx_callback: Callable[[], None] | None = None self.outputs: List[IO[str]] = [sys.stdout] self.failed = False self.section_failed = False @@ -70,6 +71,9 @@ class TestLogger: else: self.outputs.append(o) + def set_context(self, ctx: Callable[[], None] | None | None): + self.ctx_callback = ctx + def print(self, line: str, with_stdout=True): self.rawprint('.. ' + line, with_stdout) @@ -177,6 +181,11 @@ class TestLogger: else: self.rawprint(f"!+ FAILURE in {self.test_name}: {type(ex).__name__} {ex!s}") + if self.ctx_callback is not None: + self.rawprint('>> Section Context') + self.ctx_callback() + self.rawprint('<< Section Context') + self.rawprint('>> Callstack') for frame in reversed(tb): filename = util.sanitise_filename(frame.filename) diff --git a/util/test/rdtest/runner.py b/util/test/rdtest/runner.py index 2b4fb6ee9..e51a68a5a 100644 --- a/util/test/rdtest/runner.py +++ b/util/test/rdtest/runner.py @@ -529,6 +529,7 @@ def internal_run_test(thread: int, test_name: str): try: instance = testclass() + log.set_context(lambda: instance.log_context()) instance.worker_thread = thread instance.invoketest(False) suceeded = True @@ -538,6 +539,8 @@ def internal_run_test(thread: int, test_name: str): except Exception as ex: log.failure(ex) suceeded = False + finally: + log.set_context(None) logfile = rd.GetLogFile() if server is not None: diff --git a/util/test/rdtest/shared/Buffer_Truncation.py b/util/test/rdtest/shared/Buffer_Truncation.py index 4c62bc282..c4a88ebfa 100644 --- a/util/test/rdtest/shared/Buffer_Truncation.py +++ b/util/test/rdtest/shared/Buffer_Truncation.py @@ -14,7 +14,7 @@ class Buffer_Truncation(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vsin_ref: rdtest.MeshReference = { 0: { diff --git a/util/test/rdtest/shared/Discard_Zoo.py b/util/test/rdtest/shared/Discard_Zoo.py index 4a2cefc54..8adba884e 100644 --- a/util/test/rdtest/shared/Discard_Zoo.py +++ b/util/test/rdtest/shared/Discard_Zoo.py @@ -184,7 +184,7 @@ class Discard_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) for tex in self.controller.GetTextures(): res = self.get_resource(tex.resourceId) @@ -196,7 +196,7 @@ class Discard_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) for tex in self.controller.GetTextures(): res = self.get_resource(tex.resourceId) diff --git a/util/test/rdtest/shared/Draw_Zoo.py b/util/test/rdtest/shared/Draw_Zoo.py index 92d3e36cb..d2d4b72ac 100644 --- a/util/test/rdtest/shared/Draw_Zoo.py +++ b/util/test/rdtest/shared/Draw_Zoo.py @@ -51,7 +51,7 @@ class Draw_Zoo(rdtest.TestCase): def check_action(self, action: rd.ActionDescription, ref_data: ActionRef): rdtest.log.print(f"Checking action {action.eventId}") - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.pipe = self.controller.GetPipelineState() diff --git a/util/test/rdtest/shared/Groupshared.py b/util/test/rdtest/shared/Groupshared.py index 5190b0a77..16e8ea388 100644 --- a/util/test/rdtest/shared/Groupshared.py +++ b/util/test/rdtest/shared/Groupshared.py @@ -57,7 +57,7 @@ class Groupshared(rdtest.TestCase): for test, action in enumerate(tests): failed = False - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() csrefl = pipe.GetShaderReflection(rd.ShaderStage.Compute) diff --git a/util/test/rdtest/shared/Mesh_Zoo.py b/util/test/rdtest/shared/Mesh_Zoo.py index 0c60c97bd..f15d593c7 100644 --- a/util/test/rdtest/shared/Mesh_Zoo.py +++ b/util/test/rdtest/shared/Mesh_Zoo.py @@ -75,10 +75,11 @@ class Mesh_Zoo(): rdtest.log.success(f"Picking {x},{y} returns vertex {result[0]} in instance {result[1]} as expected") - def check_capture(self, capture_filename: str, controller: rd.ReplayController): - self.controller = controller + def check_capture(self, capture_filename: str, test: rdtest.testcase.TestCase): + self.test = test + self.controller = test.controller - self.controller.SetFrameEvent(self.find_action("Quad").nextAction.eventId, False) + self.test.set_event(self.find_action("Quad").nextAction.eventId, False) self.out = self.controller.CreateOutput( rd.CreateHeadlessWindowingData(200, 200), rd.ReplayOutputType.Mesh @@ -358,7 +359,7 @@ class Mesh_Zoo(): rdtest.log.success("Both instance picking is as expected") - self.controller.SetFrameEvent(self.find_action("Points").nextAction.eventId, False) + self.test.set_event(self.find_action("Points").nextAction.eventId, False) # Only one instance, just check we can see the points self.cfg.curInstance = 0 @@ -388,7 +389,7 @@ class Mesh_Zoo(): rdtest.log.success("Point solid and lit rendering works as expected") - self.controller.SetFrameEvent(self.find_action("Lines").nextAction.eventId, False) + self.test.set_event(self.find_action("Lines").nextAction.eventId, False) self.cache_output() self.cfg.visualisationMode = rd.Visualisation.Lit @@ -396,7 +397,7 @@ class Mesh_Zoo(): rdtest.log.success("Lines solid and lit rendering works as expected") - self.controller.SetFrameEvent(self.find_action("Stride 0").nextAction.eventId, False) + self.test.set_event(self.find_action("Stride 0").nextAction.eventId, False) self.cfg.position = self.controller.GetPostVSData(0, 0, self.cfg.type) self.cfg.position.nearPlane = 1.0 @@ -411,7 +412,7 @@ class Mesh_Zoo(): self.check_vertex(105, 65, (rd.ReplayOutput.NoResult, rd.ReplayOutput.NoResult)) self.check_vertex(115, 135, (rd.ReplayOutput.NoResult, rd.ReplayOutput.NoResult)) - self.controller.SetFrameEvent(self.find_action("Empty").nextAction.eventId, False) + self.test.set_event(self.find_action("Empty").nextAction.eventId, False) self.cfg.position = self.controller.GetPostVSData(0, 0, self.cfg.type) self.cfg.position.nearPlane = 1.0 diff --git a/util/test/rdtest/shared/Overlay_Test.py b/util/test/rdtest/shared/Overlay_Test.py index 2098919f7..68c0a20fb 100644 --- a/util/test/rdtest/shared/Overlay_Test.py +++ b/util/test/rdtest/shared/Overlay_Test.py @@ -40,7 +40,7 @@ class Overlay_Test(rdtest.TestCase): marker_name += fmt test_marker = self.find_action(marker_name, base_event) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) rdtest.log.print(f"Checking overlays at event {test_marker.nextAction.eventId}: {marker_name}") @@ -429,7 +429,7 @@ class Overlay_Test(rdtest.TestCase): # Shader with discard test_marker = self.find_action("Discard " + marker_name, base_event) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() tex.overlay = rd.DebugOverlay.Depth out.SetTextureDisplay(tex) @@ -440,7 +440,7 @@ class Overlay_Test(rdtest.TestCase): # Check the viewport overlay especially view_marker = self.find_action("Viewport Test " + fmt, base_event) - self.controller.SetFrameEvent(view_marker.nextAction.eventId, True) + self.set_event(view_marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() @@ -559,7 +559,7 @@ class Overlay_Test(rdtest.TestCase): # Check the sample mask test mask_marker = self.find_action("Sample Mask Test " + fmt, base_event) - self.controller.SetFrameEvent(mask_marker.nextAction.eventId, True) + self.set_event(mask_marker.nextAction.eventId, True) col_tex = pipe.GetOutputTargets()[0].resource @@ -589,7 +589,7 @@ class Overlay_Test(rdtest.TestCase): test_marker = self.find_action("Normal Test " + fmt, base_event) # Now check clear-before-X by hand, for colour and for depth - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) col_tex = pipe.GetOutputTargets()[0].resource @@ -728,7 +728,7 @@ class Overlay_Test(rdtest.TestCase): for mip in [2, 3]: sub_marker = self.find_action(f"Subresources mip {mip}", base_event) - self.controller.SetFrameEvent(sub_marker.nextAction.eventId, True) + self.set_event(sub_marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/rdtest/shared/Pixel_History.py b/util/test/rdtest/shared/Pixel_History.py index 21d5058e9..a9524a65e 100644 --- a/util/test/rdtest/shared/Pixel_History.py +++ b/util/test/rdtest/shared/Pixel_History.py @@ -72,7 +72,7 @@ class Pixel_History(rdtest.TestCase): def batch_test(self, base_eid: int): test_marker = self.find_action("Simple Test", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() @@ -437,7 +437,7 @@ class Pixel_History(rdtest.TestCase): rdtest.log.print("Testing stencil/scissor checks") test_marker = self.find_action("Stencil Mask", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(106, 248) rdtest.log.print(f"Testing pixel {x}, {y}") @@ -478,7 +478,7 @@ class Pixel_History(rdtest.TestCase): rdtest.log.print("Testing depth test for per fragment reporting") test_marker = self.find_action("Depth Test", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(275, 258) rdtest.log.print(f"Testing pixel {x}, {y}") @@ -585,7 +585,7 @@ class Pixel_History(rdtest.TestCase): # For pixel 60, 130 inside the light green triangle which is 300 draws of 1 instance of 1 triangle rdtest.log.print("Testing Lots of Drawcalls") test_marker = self.find_action("300 Instances", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(60, 130) rdtest.log.print(f"Testing pixel {x}, {y}") modifs = self.controller.PixelHistory(tex, x, y, sub, comp) @@ -616,7 +616,7 @@ class Pixel_History(rdtest.TestCase): rdtest.log.print("Testing Sample colouring") test_marker = self.find_action("Sample Colouring", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(330, 200) rdtest.log.print(f"Testing pixel {x}, {y}") modifs = self.controller.PixelHistory(tex, x, y, sub, comp) @@ -693,7 +693,7 @@ class Pixel_History(rdtest.TestCase): rdtest.log.print("Testing depth-equal testing") test_marker = self.find_action("Depth Equal Pass", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(200, 250) rdtest.log.print(f"Testing pixel {x}, {y}") @@ -735,7 +735,7 @@ class Pixel_History(rdtest.TestCase): rdtest.log.print("Testing colour masking") test_marker = self.find_action("Colour Masked", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(60, 80) rdtest.log.print(f"Testing pixel {x}, {y}") @@ -760,7 +760,7 @@ class Pixel_History(rdtest.TestCase): # don't have compute writes in secondaries and some tests like D3D MSAA won't have compute writes if test_marker is not None and not self.is_secondary and base_eid in self.get_hierarchy(test_marker.eventId): - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(225, 85) rdtest.log.print(f"Testing pixel {x}, {y}") modifs = self.controller.PixelHistory(tex, x, y, sub, comp) @@ -787,7 +787,7 @@ class Pixel_History(rdtest.TestCase): rdtest.log.print("Testing overflowed writes") test_marker = self.find_action("Overflowing", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(105, 50) rdtest.log.print(f"Testing pixel {x}, {y}") @@ -834,7 +834,7 @@ class Pixel_History(rdtest.TestCase): rdtest.log.print("Testing per-fragment discards") test_marker = self.find_action("Per-Fragment discarding", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) x, y = self.relative_xy(60, 160) rdtest.log.print(f"Testing pixel {x}, {y}") @@ -884,7 +884,7 @@ class Pixel_History(rdtest.TestCase): x, y = self.relative_xy(120, 110) rdtest.log.print(f"Testing D3D no-output shader {x}, {y}") test_marker = self.find_action("No Output Shader", base_eid) - self.controller.SetFrameEvent(test_marker.nextAction.eventId, True) + self.set_event(test_marker.nextAction.eventId, True) modifs = self.controller.PixelHistory(tex, x, y, sub, comp) events = [ diff --git a/util/test/rdtest/shared/Subgroup_Zoo.py b/util/test/rdtest/shared/Subgroup_Zoo.py index b42740088..d031ed2d9 100644 --- a/util/test/rdtest/shared/Subgroup_Zoo.py +++ b/util/test/rdtest/shared/Subgroup_Zoo.py @@ -69,7 +69,7 @@ class Subgroup_Zoo(rdtest.TestCase): for test, action in enumerate(compute_tests): failed = False - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() csrefl = pipe.GetShaderReflection(rd.ShaderStage.Compute) @@ -145,7 +145,7 @@ class Subgroup_Zoo(rdtest.TestCase): overallFailed = False for idx, action in enumerate(graphics_tests): failed = False - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/rdtest/shared/Texture_Zoo.py b/util/test/rdtest/shared/Texture_Zoo.py index 4618cba49..27214a85d 100644 --- a/util/test/rdtest/shared/Texture_Zoo.py +++ b/util/test/rdtest/shared/Texture_Zoo.py @@ -561,7 +561,7 @@ class Texture_Zoo(): if 'slice tests' in d.customName: for sub in d.children: if sub.flags & rd.ActionFlags.Drawcall: - self.controller.SetFrameEvent(sub.eventId, True) + self.test.set_event(sub.eventId, True) pipe = self.controller.GetPipelineState() @@ -629,7 +629,7 @@ class Texture_Zoo(): tests_run = tests_run + 1 try: # Set this event as current - self.controller.SetFrameEvent(sub.eventId, True) + self.test.set_event(sub.eventId, True) self.filename = (d.customName + '@' + name).replace('->', '_') @@ -653,8 +653,9 @@ class Texture_Zoo(): else: raise rdtest.TestFailureException("Some tests were not as expected") - def check_capture(self, capture_filename: str, controller: rd.ReplayController): - self.controller = controller + def check_capture(self, capture_filename: str, test: rdtest.testcase.TestCase): + self.test = test + self.controller = test.controller self.pipeType = self.controller.GetAPIProperties().pipelineType self.opengl_mode = (self.controller.GetAPIProperties().pipelineType == rd.GraphicsAPI.OpenGL) @@ -705,6 +706,7 @@ class Texture_Zoo(): result, self.controller = remote.OpenCapture( proxies.index(api), capture_filename, rd.ReplayOptions(), None ) + self.test.controller = self.controller # Now check with the proxy self.check_capture_with_controller(api) @@ -741,6 +743,7 @@ class Texture_Zoo(): continue result, self.controller = cap.OpenCapture(rd.ReplayOptions(), None) + self.test.controller = self.controller if not result: rdtest.log.error(f"Couldn't open {file.name}") @@ -751,7 +754,7 @@ class Texture_Zoo(): [a, b] = file.name.replace('.dds', ' (DDS)').replace('.png', ' (PNG)').split('@') - self.controller.SetFrameEvent(self.controller.GetRootActions()[0].eventId, True) + self.test.set_event(self.controller.GetRootActions()[0].eventId, True) try: self.opengl_mode = False diff --git a/util/test/rdtest/testcase.py b/util/test/rdtest/testcase.py index 9d7121d02..5ea222c49 100644 --- a/util/test/rdtest/testcase.py +++ b/util/test/rdtest/testcase.py @@ -166,6 +166,7 @@ class TestCase: self.worker_thread = 0 self.controller: rd.ReplayController | None = None self.sdfile: rd.SDFile | None = None + self.cur_event = 0 self._variables = [] def get_time(self): @@ -241,6 +242,13 @@ class TestCase: return self.sdfile.chunks[action.events[-1].chunkIndex].name + def set_event(self, eid: int, force: bool): + self.cur_event = eid + self.controller.SetFrameEvent(eid, force) + + def log_context(self): + log.print(f"Current Event: {self.cur_event}") + def _find_action(self, name: str, start_event: int, action_list: List[rd.ActionDescription]) -> rd.ActionDescription | None: bestMatch = None distance = 1000000 @@ -694,7 +702,7 @@ class TestCase: last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) save_data = rd.TextureSave() save_data.resourceId = last_action.copyDestination diff --git a/util/test/tests/D3D11/D3D11_AMD_Shader_Extensions.py b/util/test/tests/D3D11/D3D11_AMD_Shader_Extensions.py index 183f9f30d..10821d329 100644 --- a/util/test/tests/D3D11/D3D11_AMD_Shader_Extensions.py +++ b/util/test/tests/D3D11/D3D11_AMD_Shader_Extensions.py @@ -11,7 +11,7 @@ class D3D11_AMD_Shader_Extensions(rdtest.TestCase): def check_capture(self): action = self.get_last_action() - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Should have barycentrics showing the closest vertex for each pixel in the triangle # Without relying on barycentric order, ensure that the three pixels are red, green, and blue @@ -81,7 +81,7 @@ class D3D11_AMD_Shader_Extensions(rdtest.TestCase): rdtest.log.success("compute shader disassembly is as expected") if refl.debugInfo.debuggable: - self.controller.SetFrameEvent(self.find_action("Dispatch").eventId, False) + self.set_event(self.find_action("Dispatch").eventId, False) trace = self.controller.DebugThread((0, 0, 0), (0, 0, 0)) diff --git a/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py b/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py index 105753046..ea89284d6 100644 --- a/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py +++ b/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py @@ -12,7 +12,7 @@ class D3D11_CBuffer_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D11/D3D11_Deferred_Map.py b/util/test/tests/D3D11/D3D11_Deferred_Map.py index 874d8673d..60be5a40d 100644 --- a/util/test/tests/D3D11/D3D11_Deferred_Map.py +++ b/util/test/tests/D3D11/D3D11_Deferred_Map.py @@ -8,7 +8,7 @@ class D3D11_Deferred_Map(rdtest.TestCase): # Check at the last action action = self.get_last_action() - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D11/D3D11_Discard_Zoo.py b/util/test/tests/D3D11/D3D11_Discard_Zoo.py index 83854142a..29857c81b 100644 --- a/util/test/tests/D3D11/D3D11_Discard_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Discard_Zoo.py @@ -16,7 +16,7 @@ class D3D11_Discard_Zoo(rdtest.Discard_Zoo): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Check the buffer for res in self.controller.GetResources(): @@ -29,7 +29,7 @@ class D3D11_Discard_Zoo(rdtest.Discard_Zoo): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Check the buffers for res in self.controller.GetResources(): diff --git a/util/test/tests/D3D11/D3D11_Feature_Level_9.py b/util/test/tests/D3D11/D3D11_Feature_Level_9.py index 07019652c..cafb303ad 100644 --- a/util/test/tests/D3D11/D3D11_Feature_Level_9.py +++ b/util/test/tests/D3D11/D3D11_Feature_Level_9.py @@ -8,7 +8,7 @@ class D3D11_Feature_Level_9(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -16,7 +16,7 @@ class D3D11_Feature_Level_9(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/D3D11/D3D11_Frame0.py b/util/test/tests/D3D11/D3D11_Frame0.py index 50cfdc984..ce6102ae5 100644 --- a/util/test/tests/D3D11/D3D11_Frame0.py +++ b/util/test/tests/D3D11/D3D11_Frame0.py @@ -21,7 +21,7 @@ class D3D11_Frame0(rdtest.TestCase): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -31,7 +31,7 @@ class D3D11_Frame0(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/D3D11/D3D11_Large_Buffer.py b/util/test/tests/D3D11/D3D11_Large_Buffer.py index cc658a5f4..8d5bcdbeb 100644 --- a/util/test/tests/D3D11/D3D11_Large_Buffer.py +++ b/util/test/tests/D3D11/D3D11_Large_Buffer.py @@ -10,7 +10,7 @@ class D3D11_Large_Buffer(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vsin_ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/D3D11/D3D11_Mesh_Zoo.py b/util/test/tests/D3D11/D3D11_Mesh_Zoo.py index 617fc8e09..7e156b594 100644 --- a/util/test/tests/D3D11/D3D11_Mesh_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Mesh_Zoo.py @@ -10,4 +10,4 @@ class D3D11_Mesh_Zoo(rdtest.TestCase): def check_capture(self): assert self.controller is not None - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) diff --git a/util/test/tests/D3D11/D3D11_Parameter_Zoo.py b/util/test/tests/D3D11/D3D11_Parameter_Zoo.py index 38109923c..47eecd84e 100644 --- a/util/test/tests/D3D11/D3D11_Parameter_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Parameter_Zoo.py @@ -12,7 +12,7 @@ class D3D11_Parameter_Zoo(rdtest.TestCase): action = self.find_action("Draw") assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -68,7 +68,7 @@ class D3D11_Parameter_Zoo(rdtest.TestCase): action = self.find_action("RastState") assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe11 = self.controller.GetD3D11PipelineState() diff --git a/util/test/tests/D3D11/D3D11_PrimitiveID.py b/util/test/tests/D3D11/D3D11_PrimitiveID.py index e537f2965..2c5dbfdd2 100644 --- a/util/test/tests/D3D11/D3D11_PrimitiveID.py +++ b/util/test/tests/D3D11/D3D11_PrimitiveID.py @@ -15,7 +15,7 @@ class D3D11_PrimitiveID(rdtest.TestCase): expected_prim: rdtest.VectorValue, expected_output: rdtest.VectorValue | None, ): - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() pixel_inputs = rd.DebugPixelInputs() diff --git a/util/test/tests/D3D11/D3D11_Primitive_Restart.py b/util/test/tests/D3D11/D3D11_Primitive_Restart.py index 7844059ea..bd3dace4b 100644 --- a/util/test/tests/D3D11/D3D11_Primitive_Restart.py +++ b/util/test/tests/D3D11/D3D11_Primitive_Restart.py @@ -10,7 +10,7 @@ class D3D11_Primitive_Restart(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -56,7 +56,7 @@ class D3D11_Primitive_Restart(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/D3D11/D3D11_Refcount_Check.py b/util/test/tests/D3D11/D3D11_Refcount_Check.py index 33d6032f0..80b2494d3 100644 --- a/util/test/tests/D3D11/D3D11_Refcount_Check.py +++ b/util/test/tests/D3D11/D3D11_Refcount_Check.py @@ -22,7 +22,7 @@ class D3D11_Refcount_Check(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D11/D3D11_Resource_Lifetimes.py b/util/test/tests/D3D11/D3D11_Resource_Lifetimes.py index 269cb495e..cf07a91ff 100644 --- a/util/test/tests/D3D11/D3D11_Resource_Lifetimes.py +++ b/util/test/tests/D3D11/D3D11_Resource_Lifetimes.py @@ -8,7 +8,7 @@ class D3D11_Resource_Lifetimes(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tex = last_action.copyDestination diff --git a/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py b/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py index 053626af6..f948fadd1 100644 --- a/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py @@ -17,7 +17,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -57,7 +57,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase): rdtest.log.begin_section("Flow tests") action = self.find_action("Flow Test").nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() # Debug the shader @@ -85,7 +85,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase): rdtest.log.begin_section("MSAA tests") action = self.find_action("MSAA Test").nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() for (x,y) in [(4, 4), (4, 5), (3, 4), (3, 5)]: for test in range(4): diff --git a/util/test/tests/D3D11/D3D11_Shader_Editing.py b/util/test/tests/D3D11/D3D11_Shader_Editing.py index 9da44f83e..3c578bdfb 100644 --- a/util/test/tests/D3D11/D3D11_Shader_Editing.py +++ b/util/test/tests/D3D11/D3D11_Shader_Editing.py @@ -7,14 +7,14 @@ class D3D11_Shader_Editing(rdtest.TestCase): def check_capture(self): eid = self.find_action("Draw 1").nextAction.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() psrefl1 = pipe.GetShaderReflection(rd.ShaderStage.Pixel) eid = self.find_action("Draw 2").nextAction.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() @@ -102,7 +102,7 @@ class D3D11_Shader_Editing(rdtest.TestCase): self.controller.ReplaceResource(psrefl2.resourceId, ps2) # Refresh the replay if it didn't happen already - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Triangles have green and blue channel self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 1.0, 1.0]) @@ -112,7 +112,7 @@ class D3D11_Shader_Editing(rdtest.TestCase): # Now "edit" the VS but don't change it. We should still get the same values self.controller.ReplaceResource(vsrefl.resourceId, nochangeVS) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Triangles have green and blue channel self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 1.0, 1.0]) @@ -122,7 +122,7 @@ class D3D11_Shader_Editing(rdtest.TestCase): # Change the VS to one that has ofpset the triangles off-centre self.controller.ReplaceResource(vsrefl.resourceId, offsetVS) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Original sample positions are now the clear color self.check_pixel_value(tex, 0.25, 0.5, [0.2, 0.2, 0.2, 1.0]) @@ -136,7 +136,7 @@ class D3D11_Shader_Editing(rdtest.TestCase): # Now undo the first ps edit self.controller.RemoveReplacement(psrefl1.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Original sample positions are still the clear color self.check_pixel_value(tex, 0.25, 0.5, [0.2, 0.2, 0.2, 1.0]) @@ -150,7 +150,7 @@ class D3D11_Shader_Editing(rdtest.TestCase): # Now undo the first VS edit self.controller.RemoveReplacement(vsrefl.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # The right triangle is the edited colour, but they are back in the original positions self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 0.0, 1.0]) @@ -160,7 +160,7 @@ class D3D11_Shader_Editing(rdtest.TestCase): # finally undo the second ps edit self.controller.RemoveReplacement(psrefl2.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # We should be back to where we started self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 0.0, 1.0]) diff --git a/util/test/tests/D3D11/D3D11_Shader_ISA.py b/util/test/tests/D3D11/D3D11_Shader_ISA.py index 09631ecbe..63ac667e0 100644 --- a/util/test/tests/D3D11/D3D11_Shader_ISA.py +++ b/util/test/tests/D3D11/D3D11_Shader_ISA.py @@ -12,7 +12,7 @@ class D3D11_Shader_ISA(rdtest.TestCase): is_amd = 'AMD' in action.customName - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py b/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py index 7ccf46c96..60082f064 100644 --- a/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py @@ -14,7 +14,7 @@ class D3D11_Shader_Linkage_Zoo(rdtest.TestCase): event_name = test_marker.customName test_marker = self.find_action("draw", action.eventId) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() # Debug the shader diff --git a/util/test/tests/D3D11/D3D11_Simple_Triangle.py b/util/test/tests/D3D11/D3D11_Simple_Triangle.py index 57691f19b..4a3b85aef 100644 --- a/util/test/tests/D3D11/D3D11_Simple_Triangle.py +++ b/util/test/tests/D3D11/D3D11_Simple_Triangle.py @@ -8,7 +8,7 @@ class D3D11_Simple_Triangle(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -18,7 +18,7 @@ class D3D11_Simple_Triangle(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/D3D11/D3D11_Stream_Out.py b/util/test/tests/D3D11/D3D11_Stream_Out.py index 63b80a82b..09e6e3009 100644 --- a/util/test/tests/D3D11/D3D11_Stream_Out.py +++ b/util/test/tests/D3D11/D3D11_Stream_Out.py @@ -10,7 +10,7 @@ class D3D11_Stream_Out(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D11/D3D11_Swapchain_Zoo.py b/util/test/tests/D3D11/D3D11_Swapchain_Zoo.py index b3631dac7..2906257de 100644 --- a/util/test/tests/D3D11/D3D11_Swapchain_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Swapchain_Zoo.py @@ -12,7 +12,7 @@ class D3D11_Swapchain_Zoo(rdtest.TestCase): action = self.find_action("DrawIndexed") while action is not None: - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) self.check_triangle(back=[0.0, 0.0, 0.0, 1.0]) diff --git a/util/test/tests/D3D11/D3D11_Texture_Zoo.py b/util/test/tests/D3D11/D3D11_Texture_Zoo.py index c607978a1..c9ad54e38 100644 --- a/util/test/tests/D3D11/D3D11_Texture_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Texture_Zoo.py @@ -13,5 +13,5 @@ class D3D11_Texture_Zoo(rdtest.TestCase): assert self.controller is not None # This takes ownership of the controller and shuts it down when it's finished self.zoo_helper.worker_thread = self.worker_thread - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) self.controller = None diff --git a/util/test/tests/D3D11/D3D11_Untyped_Backbuffer_Descriptor.py b/util/test/tests/D3D11/D3D11_Untyped_Backbuffer_Descriptor.py index 2c4aa4811..63adcddf3 100644 --- a/util/test/tests/D3D11/D3D11_Untyped_Backbuffer_Descriptor.py +++ b/util/test/tests/D3D11/D3D11_Untyped_Backbuffer_Descriptor.py @@ -8,7 +8,7 @@ class D3D11_Untyped_Backbuffer_Descriptor(rdtest.TestCase): # find the first action action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -19,7 +19,7 @@ class D3D11_Untyped_Backbuffer_Descriptor(rdtest.TestCase): # find the second action action = self.find_action("Draw", action.eventId+1) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D11/D3D11_Vertex_Attr_Zoo.py b/util/test/tests/D3D11/D3D11_Vertex_Attr_Zoo.py index 8508b7e30..b134147a7 100644 --- a/util/test/tests/D3D11/D3D11_Vertex_Attr_Zoo.py +++ b/util/test/tests/D3D11/D3D11_Vertex_Attr_Zoo.py @@ -11,7 +11,7 @@ class D3D11_Vertex_Attr_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py b/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py index 40405fb25..9c85cb396 100644 --- a/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py +++ b/util/test/tests/D3D12/D3D12_AMD_Shader_Extensions.py @@ -13,7 +13,7 @@ class D3D12_AMD_Shader_Extensions(rdtest.TestCase): action = self.find_action(pass_type + " Draw") if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() tex = pipe.GetOutputTargets()[0].resource @@ -41,7 +41,7 @@ class D3D12_AMD_Shader_Extensions(rdtest.TestCase): action = self.find_action(pass_type + " Dispatch") - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) # find the cpuMax and gpuMax actions cpuMax = self.find_action(pass_type + " cpuMax") @@ -110,7 +110,7 @@ class D3D12_AMD_Shader_Extensions(rdtest.TestCase): rdtest.log.success("compute shader disassembly is as expected") if refl.debugInfo.debuggable: - self.controller.SetFrameEvent(self.find_action("Dispatch").eventId, False) + self.set_event(self.find_action("Dispatch").eventId, False) trace = self.controller.DebugThread((0, 0, 0), (0, 0, 0)) diff --git a/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py b/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py index a3e6cdb55..c1824ffa9 100644 --- a/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py +++ b/util/test/tests/D3D12/D3D12_Blend_Pixel_History.py @@ -19,7 +19,7 @@ class D3D12_Blend_Pixel_History(rdtest.TestCase): assert test_marker is not None - self.controller.SetFrameEvent(test_marker.eventId, True) + self.set_event(test_marker.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py index 7d29d7b41..65356157a 100644 --- a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py +++ b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py @@ -12,7 +12,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() @@ -38,7 +38,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase): return rdtest.log.begin_section("SM6.0 Draw") - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() @@ -59,7 +59,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase): return rdtest.log.begin_section("SM6.6 Draw") - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Compute_Only.py b/util/test/tests/D3D12/D3D12_Compute_Only.py index e7fef0ca3..83f52b483 100644 --- a/util/test/tests/D3D12/D3D12_Compute_Only.py +++ b/util/test/tests/D3D12/D3D12_Compute_Only.py @@ -12,7 +12,7 @@ class D3D12_Compute_Only(rdtest.TestCase): self.check_pixel_value(tex, 0, 0, [0.25, 0.5, 0.75, 1.0]) - self.controller.SetFrameEvent(self.find_action("Pre-Dispatch").eventId, True) + self.set_event(self.find_action("Pre-Dispatch").eventId, True) uints = struct.unpack_from('=4L', self.controller.GetBufferData(bufin, 0, 0), 0) @@ -26,7 +26,7 @@ class D3D12_Compute_Only(rdtest.TestCase): raise rdtest.TestFailureException( f'bufout data is incorrect before dispatch: {uints}') - self.controller.SetFrameEvent(self.find_action("Post-Dispatch").eventId, True) + self.set_event(self.find_action("Post-Dispatch").eventId, True) uints = struct.unpack_from('=4L', self.controller.GetBufferData(bufout, 0, 0), 0) diff --git a/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py b/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py index b12c52ffb..78aef86bb 100644 --- a/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py +++ b/util/test/tests/D3D12/D3D12_Descriptor_Indexing.py @@ -10,7 +10,7 @@ class D3D12_Descriptor_Indexing(rdtest.TestCase): def check_compute(self, eventId: int): action = self.find_action("Dispatch", eventId) assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() d3d12pipe = self.controller.GetD3D12PipelineState() @@ -44,7 +44,7 @@ class D3D12_Descriptor_Indexing(rdtest.TestCase): action = self.find_action("Draw", base.eventId) assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() d3d12pipe = self.controller.GetD3D12PipelineState() @@ -164,7 +164,7 @@ class D3D12_Descriptor_Indexing(rdtest.TestCase): action = self.find_action("Draw", base.eventId) assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Discard_Zoo.py b/util/test/tests/D3D12/D3D12_Discard_Zoo.py index 2a9600c7f..6ee200748 100644 --- a/util/test/tests/D3D12/D3D12_Discard_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Discard_Zoo.py @@ -16,7 +16,7 @@ class D3D12_Discard_Zoo(rdtest.Discard_Zoo): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Check the buffer for res in self.controller.GetResources(): @@ -29,7 +29,7 @@ class D3D12_Discard_Zoo(rdtest.Discard_Zoo): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Check the buffer for res in self.controller.GetResources(): diff --git a/util/test/tests/D3D12/D3D12_Execute_Indirect.py b/util/test/tests/D3D12/D3D12_Execute_Indirect.py index dc461cff1..75570b8f6 100644 --- a/util/test/tests/D3D12/D3D12_Execute_Indirect.py +++ b/util/test/tests/D3D12/D3D12_Execute_Indirect.py @@ -74,10 +74,10 @@ class D3D12_Execute_Indirect(rdtest.TestCase): with rdtest.log.auto_section('EI without Root Signature'): action = self.find_action("EI without Root Signature"); - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) action = self.find_action("IndirectDraw", action.eventId) for drawNum in range(3): - self.controller.SetFrameEvent(action.eventId + drawNum, False) + self.set_event(action.eventId + drawNum, False) pipe = self.controller.GetPipelineState() if len(pipe.GetOutputTargets()) != 1: raise rdtest.TestFailureException( @@ -89,7 +89,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): with rdtest.log.auto_section('Multiple draws'): from_eid = self.find_action("Multiple draws").eventId ei_eid = self.find_action("ExecuteIndirect", from_eid).eventId - self.controller.SetFrameEvent(ei_eid - 1, False) + self.set_event(ei_eid - 1, False) self.check_root_consts([10.0, 9.0, 8.0, 7.0]) viewX = 0 viewY = 0 @@ -100,7 +100,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): action = self.find_action("IndirectDraw", from_eid) assert action is not None eid = action.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) self.check_root_consts([123.0, 9.0, 8.0, 7.0]) # Should be a green triangle in the centre of the screen on a black background @@ -176,7 +176,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): viewX = 0 viewY = 0 action = self.find_action("Post draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # triangle should still be visible self.check_triangle(back=[0.0, 0.0, 0.0, 1.0], vp=[viewX, viewY, viewW, viewH]) @@ -196,7 +196,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): with rdtest.log.auto_section('Dispatch buffer output is correct'): action = self.find_action("Post Single dispatch") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() rw = pipe.GetReadWriteResources(rd.ShaderStage.Compute) @@ -243,7 +243,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): # do N passes since it will be unpredictable for passNum in range(50): for drawNum in range(8): - self.controller.SetFrameEvent(action.eventId + drawNum, False) + self.set_event(action.eventId + drawNum, False) pipe = self.controller.GetPipelineState() out = pipe.GetOutputTargets()[0].resource @@ -286,7 +286,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): action = self.find_action("Full Arg Buffer") action = self.find_action("IndirectDraw", action.eventId) for drawNum in range(3): - self.controller.SetFrameEvent(action.eventId + drawNum, False) + self.set_event(action.eventId + drawNum, False) pipe = self.controller.GetPipelineState() if len(pipe.GetOutputTargets()) != 1: raise rdtest.TestFailureException( @@ -300,7 +300,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): action = self.find_action("IndirectDraw", action.eventId) for drawNum in range(3): eid = action.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() if len(pipe.GetOutputTargets()) != 1: raise rdtest.TestFailureException( @@ -335,7 +335,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): action = self.find_action("IndirectDraw", executeAction.eventId) for drawNum in range(min(countDraws, 12)): eid = action.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() if len(pipe.GetOutputTargets()) != 1: raise rdtest.TestFailureException( @@ -369,7 +369,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): action = self.find_action("IndirectDraw", action.eventId+1) eid = action.eventId - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() if len(pipe.GetOutputTargets()) != 1: raise rdtest.TestFailureException( @@ -400,7 +400,7 @@ class D3D12_Execute_Indirect(rdtest.TestCase): for eid in range(self.get_first_action().eventId, self.get_last_action().eventId + 1): if eid >= skipEIDmin and eid <= skipEIDmax: continue - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() if len(pipe.GetOutputTargets()) == 0: continue diff --git a/util/test/tests/D3D12/D3D12_Existing_Heap.py b/util/test/tests/D3D12/D3D12_Existing_Heap.py index 6cb417d61..66a281aaa 100644 --- a/util/test/tests/D3D12/D3D12_Existing_Heap.py +++ b/util/test/tests/D3D12/D3D12_Existing_Heap.py @@ -8,7 +8,7 @@ class D3D12_Existing_Heap(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -16,7 +16,7 @@ class D3D12_Existing_Heap(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/D3D12/D3D12_Frame0.py b/util/test/tests/D3D12/D3D12_Frame0.py index 407f9a011..669944e78 100644 --- a/util/test/tests/D3D12/D3D12_Frame0.py +++ b/util/test/tests/D3D12/D3D12_Frame0.py @@ -21,7 +21,7 @@ class D3D12_Frame0(rdtest.TestCase): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -31,7 +31,7 @@ class D3D12_Frame0(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/D3D12/D3D12_Large_Buffer.py b/util/test/tests/D3D12/D3D12_Large_Buffer.py index 01e83ed83..f930a6d2c 100644 --- a/util/test/tests/D3D12/D3D12_Large_Buffer.py +++ b/util/test/tests/D3D12/D3D12_Large_Buffer.py @@ -10,7 +10,7 @@ class D3D12_Large_Buffer(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vsin_ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py b/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py index d60867980..a444ebe12 100644 --- a/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py +++ b/util/test/tests/D3D12/D3D12_List_Alloc_Tests.py @@ -12,7 +12,7 @@ class D3D12_List_Alloc_Tests(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_List_Types.py b/util/test/tests/D3D12/D3D12_List_Types.py index 730d30c8b..0857e17af 100644 --- a/util/test/tests/D3D12/D3D12_List_Types.py +++ b/util/test/tests/D3D12/D3D12_List_Types.py @@ -10,7 +10,7 @@ class D3D12_List_Types(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) self.check_triangle(out=action.outputs[0], fore=[0.0, 1.0, 1.0, 1.0]) diff --git a/util/test/tests/D3D12/D3D12_Map_PlacedAlias.py b/util/test/tests/D3D12/D3D12_Map_PlacedAlias.py index 0e4b3a711..dc21921aa 100644 --- a/util/test/tests/D3D12/D3D12_Map_PlacedAlias.py +++ b/util/test/tests/D3D12/D3D12_Map_PlacedAlias.py @@ -7,6 +7,6 @@ class D3D12_Map_PlacedAlias(rdtest.TestCase): def check_capture(self): action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.check_triangle() diff --git a/util/test/tests/D3D12/D3D12_Memory_Overlap.py b/util/test/tests/D3D12/D3D12_Memory_Overlap.py index fdafd9071..08fe77c54 100644 --- a/util/test/tests/D3D12/D3D12_Memory_Overlap.py +++ b/util/test/tests/D3D12/D3D12_Memory_Overlap.py @@ -7,6 +7,6 @@ class D3D12_Memory_Overlap(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) diff --git a/util/test/tests/D3D12/D3D12_Mesh_Shader.py b/util/test/tests/D3D12/D3D12_Mesh_Shader.py index 51683c4a4..0b0979f65 100644 --- a/util/test/tests/D3D12/D3D12_Mesh_Shader.py +++ b/util/test/tests/D3D12/D3D12_Mesh_Shader.py @@ -59,7 +59,7 @@ class D3D12_Mesh_Shader(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) action = self.find_action("Mesh Shaders") @@ -67,7 +67,7 @@ class D3D12_Mesh_Shader(rdtest.TestCase): assert action is not None name = f"Pure Mesh Shader Test EID:{action.eventId}" rdtest.log.begin_section(name) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) x = 70 y = 70 @@ -85,7 +85,7 @@ class D3D12_Mesh_Shader(rdtest.TestCase): assert action is not None name = f"Amplification Shader with Global Payload EID:{action.eventId}" rdtest.log.begin_section(name) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postts_ref = self.build_global_taskout_reference() postts_data = self.get_task_data(action) @@ -104,7 +104,7 @@ class D3D12_Mesh_Shader(rdtest.TestCase): assert action is not None name = f"Amplification Shader with Local Payload EID:{action.eventId}" rdtest.log.begin_section(name) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postts_ref = self.build_local_taskout_reference() postts_data = self.get_task_data(action) diff --git a/util/test/tests/D3D12/D3D12_Mesh_Zoo.py b/util/test/tests/D3D12/D3D12_Mesh_Zoo.py index 60a6dca80..239580e7c 100644 --- a/util/test/tests/D3D12/D3D12_Mesh_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Mesh_Zoo.py @@ -10,4 +10,4 @@ class D3D12_Mesh_Zoo(rdtest.TestCase): def check_capture(self): assert self.controller is not None - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) diff --git a/util/test/tests/D3D12/D3D12_Multi_Wait_Before_Signal.py b/util/test/tests/D3D12/D3D12_Multi_Wait_Before_Signal.py index 8b70c260f..45acae8dc 100644 --- a/util/test/tests/D3D12/D3D12_Multi_Wait_Before_Signal.py +++ b/util/test/tests/D3D12/D3D12_Multi_Wait_Before_Signal.py @@ -14,7 +14,7 @@ class D3D12_Multi_Wait_Before_Signal(rdtest.TestCase): assert draw_marker is not None - self.controller.SetFrameEvent(draw_marker.eventId, False) + self.set_event(draw_marker.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Overlay_Test.py b/util/test/tests/D3D12/D3D12_Overlay_Test.py index ba621664a..dee5d0eaf 100644 --- a/util/test/tests/D3D12/D3D12_Overlay_Test.py +++ b/util/test/tests/D3D12/D3D12_Overlay_Test.py @@ -25,7 +25,7 @@ class D3D12_Overlay_Test(rdtest.Overlay_Test): # Don't check any pixel values, but ensure all overlays at least work with no viewport/scissor bound sub_marker = self.find_action("NoView draw", base_event) - self.controller.SetFrameEvent(sub_marker.nextAction.eventId, True) + self.set_event(sub_marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Parameter_Zoo.py b/util/test/tests/D3D12/D3D12_Parameter_Zoo.py index bc65e711c..0e1474db9 100644 --- a/util/test/tests/D3D12/D3D12_Parameter_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Parameter_Zoo.py @@ -12,7 +12,7 @@ class D3D12_Parameter_Zoo(rdtest.TestCase): action = action.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -100,7 +100,7 @@ class D3D12_Parameter_Zoo(rdtest.TestCase): action = self.find_action("No Sig Draw") action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -111,14 +111,14 @@ class D3D12_Parameter_Zoo(rdtest.TestCase): action = self.find_action("No Sig Dispatch") action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # nothing to actually check here action = self.find_action("Temp heap Draw") action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Predication.py b/util/test/tests/D3D12/D3D12_Predication.py index 5f1bdad6b..bf4aedf0c 100644 --- a/util/test/tests/D3D12/D3D12_Predication.py +++ b/util/test/tests/D3D12/D3D12_Predication.py @@ -16,7 +16,7 @@ class D3D12_Predication(rdtest.TestCase): viewport_array: Callable[[rd.Viewport], Tuple[float,float,float,float]] = lambda view: (view.x, view.y, view.width, view.height) - self.controller.SetFrameEvent(a.eventId, False) + self.set_event(a.eventId, False) pipe = self.controller.GetPipelineState() self.check_triangle(vp=viewport_array(pipe.GetViewport(0))) @@ -24,7 +24,7 @@ class D3D12_Predication(rdtest.TestCase): assert self.controller.GetD3D12PipelineState().predication.resourceId == rd.ResourceId() - self.controller.SetFrameEvent(b.eventId, False) + self.set_event(b.eventId, False) pipe = self.controller.GetPipelineState() self.check_triangle(vp=viewport_array(pipe.GetViewport(0))) @@ -33,7 +33,7 @@ class D3D12_Predication(rdtest.TestCase): rdtest.log.success("Fixed data predicated triangle is correct") - self.controller.SetFrameEvent(c.eventId, False) + self.set_event(c.eventId, False) pipe = self.controller.GetPipelineState() self.check_triangle(vp=viewport_array(pipe.GetViewport(0))) @@ -42,13 +42,13 @@ class D3D12_Predication(rdtest.TestCase): rdtest.log.success("Current frame query-predicated triangle is correct") - self.controller.SetFrameEvent(d.eventId, False) + self.set_event(d.eventId, False) pipe = self.controller.GetPipelineState() self.check_triangle(vp=viewport_array(pipe.GetViewport(0))) rdtest.log.success("Previous frame query-predicated triangle is correct") - self.controller.SetFrameEvent(e.eventId, False) + self.set_event(e.eventId, False) pipe = self.controller.GetPipelineState() self.check_pixel_value(pipe.GetOutputTargets()[0].resource, 200, 150, [0.2, 0.2, 0.2, 1.0]) @@ -58,7 +58,7 @@ class D3D12_Predication(rdtest.TestCase): rdtest.log.success("Failing predicated triangle is correct") for eid in range(self.get_last_action().eventId): - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) if not self.controller.GetFatalErrorStatus().OK(): raise rdtest.TestFailureException(self.controller.GetFatalErrorStatus().Message()) diff --git a/util/test/tests/D3D12/D3D12_PrimitiveID.py b/util/test/tests/D3D12/D3D12_PrimitiveID.py index 2a54d6445..4c6bf62e7 100644 --- a/util/test/tests/D3D12/D3D12_PrimitiveID.py +++ b/util/test/tests/D3D12/D3D12_PrimitiveID.py @@ -15,7 +15,7 @@ class D3D12_PrimitiveID(rdtest.TestCase): expected_prim: rdtest.VectorValue, expected_output: rdtest.VectorValue | None, ): - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Pixel).debugInfo.debuggable: diff --git a/util/test/tests/D3D12/D3D12_Reflection_Zoo.py b/util/test/tests/D3D12/D3D12_Reflection_Zoo.py index 4a83e7ead..402ed1618 100644 --- a/util/test/tests/D3D12/D3D12_Reflection_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Reflection_Zoo.py @@ -13,7 +13,7 @@ class D3D12_Reflection_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() @@ -37,7 +37,7 @@ class D3D12_Reflection_Zoo(rdtest.TestCase): rdtest.log.print("No SM6.0 DXIL action to test") return - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() @@ -58,7 +58,7 @@ class D3D12_Reflection_Zoo(rdtest.TestCase): rdtest.log.print("No SM6.7 DXIL action to test") return - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py b/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py index cd1dab45d..69ea6494a 100644 --- a/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py +++ b/util/test/tests/D3D12/D3D12_RenderTarget_Binds.py @@ -8,7 +8,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase): # find the clear action = self.find_action("ClearRenderTargetView") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -20,7 +20,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -36,7 +36,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -52,7 +52,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -68,7 +68,7 @@ class D3D12_RenderTarget_Binds(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Render_Pass.py b/util/test/tests/D3D12/D3D12_Render_Pass.py index 6296028e2..0bb3f01ff 100644 --- a/util/test/tests/D3D12/D3D12_Render_Pass.py +++ b/util/test/tests/D3D12/D3D12_Render_Pass.py @@ -11,19 +11,19 @@ class D3D12_Render_Pass(rdtest.TestCase): action = next(d for d in rp1.children if d.flags & rd.ActionFlags.Drawcall) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) self.check_triangle(back=[0.0, 0.0, 1.0, 1.0]) action = next(d for d in rp2.children if d.flags & rd.ActionFlags.Drawcall) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) self.check_triangle(back=[1.0, 0.0, 1.0, 1.0]) action = self.get_last_action() - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) self.check_pixel_value(action.copyDestination, 0.45, 0.45, [0.0, 0.0, 1.0, 1.0]) self.check_pixel_value(action.copyDestination, 0.55, 0.55, [1.0, 0.0, 1.0, 1.0]) diff --git a/util/test/tests/D3D12/D3D12_Resource_Lifetimes.py b/util/test/tests/D3D12/D3D12_Resource_Lifetimes.py index 7e559f713..ade814c7c 100644 --- a/util/test/tests/D3D12/D3D12_Resource_Lifetimes.py +++ b/util/test/tests/D3D12/D3D12_Resource_Lifetimes.py @@ -8,7 +8,7 @@ class D3D12_Resource_Lifetimes(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tex = last_action.copyDestination diff --git a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py index f780199bb..bae4eeb5d 100644 --- a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py @@ -49,18 +49,18 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): rdtest.log.begin_section("SM5.x tests") test_marker = self.find_action("sm_5_0") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) failed = not self.test_debug_pixel(200, 200, "sm_5_0") or failed test_marker = self.find_action("sm_5_1") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) failed = not self.test_debug_pixel(200, 200, "sm_5_1") or failed rdtest.log.begin_section("Resource array tests") test_marker = self.find_action("ResArray") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) for y in range(4): for x in range(4): @@ -71,7 +71,7 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): rdtest.log.begin_section("Bindless tests") test_marker = self.find_action("Bindless") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) for y in range(4): for x in range(4): @@ -88,18 +88,18 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): rdtest.log.begin_section("SM6.0 tests") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) failed = not self.test_debug_pixel(200, 200, "SM6.0") or failed test_marker = self.find_action("SM6.0 Table") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) failed = not self.test_debug_pixel(200, 200, "SM6.0 Table") or failed rdtest.log.begin_section("Resource array tests") test_marker = self.find_action("SM6.0 ResArray") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) for y in range(4): for x in range(4): @@ -110,7 +110,7 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): rdtest.log.begin_section("Bindless tests") test_marker = self.find_action("SM6.0 Bindless") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) for y in range(4): for x in range(4): @@ -127,18 +127,18 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): rdtest.log.begin_section("SM6.6 tests") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) failed = not self.test_debug_pixel(200, 200, "SM6.6") or failed test_marker = self.find_action("SM6.6 Table") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) failed = not self.test_debug_pixel(200, 200, "SM6.6 Table") or failed rdtest.log.begin_section("Resource array tests") test_marker = self.find_action("SM6.6 ResArray") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) for y in range(4): for x in range(4): @@ -149,7 +149,7 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase): rdtest.log.begin_section("Bindless tests") test_marker = self.find_action("SM6.6 Bindless") action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) for y in range(4): for x in range(4): diff --git a/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py index 835e6ba8e..7c493fb6a 100644 --- a/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py @@ -93,7 +93,7 @@ class D3D12_Shader_DebugData_Zoo(rdtest.TestCase): rdtest.log.end_section(shaderModels[sm] + " tests") continue action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -250,7 +250,7 @@ class D3D12_Shader_DebugData_Zoo(rdtest.TestCase): rdtest.log.end_section(section) continue action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Compute).debugInfo.debuggable: rdtest.log.print(f"Skipping undebuggable Compute shader at {action.eventId} for {csShaderModels[sm]}.") diff --git a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py index 56babe23b..2c0528590 100644 --- a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py @@ -28,7 +28,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase): a for a in comp_dim.children if a.flags & rd.ActionFlags.Dispatch] for test, action in enumerate(compute_tests): - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() csrefl = pipe.GetShaderReflection(rd.ShaderStage.Compute) if not csrefl.debugInfo.debuggable: @@ -134,7 +134,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase): continue action = test_marker.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -196,7 +196,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase): rdtest.log.begin_section(marker) test_marker = self.find_action(marker) action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() for (x,y) in [(4, 4), (4, 5), (3, 4), (3, 5)]: for test in range(4): @@ -240,7 +240,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase): continue action = test_marker.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() if pipe.GetShaderReflection(rd.ShaderStage.Vertex).debugInfo.debuggable: @@ -283,7 +283,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase): test_marker = self.find_action("Banned") action = test_marker.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() # Debug the banned vertex shader @@ -324,7 +324,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase): rdtest.log.end_section(section) continue action = test_marker.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Compute).debugInfo.debuggable: rdtest.log.print(f"Skipping undebuggable Compute shader at {action.eventId} for {csShaderModels[sm]}.") diff --git a/util/test/tests/D3D12/D3D12_Shader_Editing.py b/util/test/tests/D3D12/D3D12_Shader_Editing.py index 9629b014e..ba7d4b7d4 100644 --- a/util/test/tests/D3D12/D3D12_Shader_Editing.py +++ b/util/test/tests/D3D12/D3D12_Shader_Editing.py @@ -7,14 +7,14 @@ class D3D12_Shader_Editing(rdtest.TestCase): def check_capture(self): eid = self.find_action("Draw 1").nextAction.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() psrefl1 = pipe.GetShaderReflection(rd.ShaderStage.Pixel) eid = self.find_action("Draw 2").nextAction.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() @@ -95,7 +95,7 @@ class D3D12_Shader_Editing(rdtest.TestCase): self.controller.ReplaceResource(psrefl2.resourceId, ps2) # Refresh the replay if it didn't happen already - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Triangles have green and blue channel self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 1.0, 1.0]) @@ -105,7 +105,7 @@ class D3D12_Shader_Editing(rdtest.TestCase): # Now "edit" the VS but don't change it. We should still get the same values self.controller.ReplaceResource(vsrefl.resourceId, nochangeVS) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Triangles have green and blue channel self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 1.0, 1.0]) @@ -115,7 +115,7 @@ class D3D12_Shader_Editing(rdtest.TestCase): # Change the VS to one that has ofpset the triangles off-centre self.controller.ReplaceResource(vsrefl.resourceId, offsetVS) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Original sample positions are now the clear color self.check_pixel_value(tex, 0.25, 0.5, [0.2, 0.2, 0.2, 1.0]) @@ -129,7 +129,7 @@ class D3D12_Shader_Editing(rdtest.TestCase): # Now undo the first ps edit self.controller.RemoveReplacement(psrefl1.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Original sample positions are still the clear color self.check_pixel_value(tex, 0.25, 0.5, [0.2, 0.2, 0.2, 1.0]) @@ -143,7 +143,7 @@ class D3D12_Shader_Editing(rdtest.TestCase): # Now undo the first VS edit self.controller.RemoveReplacement(vsrefl.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # The right triangle is the edited colour, but they are back in the original positions self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 0.0, 1.0]) @@ -153,7 +153,7 @@ class D3D12_Shader_Editing(rdtest.TestCase): # finally undo the second ps edit self.controller.RemoveReplacement(psrefl2.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # We should be back to where we started self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 0.0, 1.0]) diff --git a/util/test/tests/D3D12/D3D12_Shader_ISA.py b/util/test/tests/D3D12/D3D12_Shader_ISA.py index 72f7b1a43..94abfc1cc 100644 --- a/util/test/tests/D3D12/D3D12_Shader_ISA.py +++ b/util/test/tests/D3D12/D3D12_Shader_ISA.py @@ -12,7 +12,7 @@ class D3D12_Shader_ISA(rdtest.TestCase): is_amd = 'AMD' in action.customName - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py index df0bda5a9..68c2207e1 100644 --- a/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py @@ -18,7 +18,7 @@ class D3D12_Shader_Linkage_Zoo(rdtest.TestCase): event_name = test_marker.customName test_marker = self.find_action("draw", action.eventId) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Pixel).debugInfo.debuggable: diff --git a/util/test/tests/D3D12/D3D12_Sharing.py b/util/test/tests/D3D12/D3D12_Sharing.py index c6e4cf3a8..49070f6b5 100644 --- a/util/test/tests/D3D12/D3D12_Sharing.py +++ b/util/test/tests/D3D12/D3D12_Sharing.py @@ -11,7 +11,7 @@ class D3D12_Sharing(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Simple_Triangle.py b/util/test/tests/D3D12/D3D12_Simple_Triangle.py index b9ed0ad70..88fb54bd3 100644 --- a/util/test/tests/D3D12/D3D12_Simple_Triangle.py +++ b/util/test/tests/D3D12/D3D12_Simple_Triangle.py @@ -8,7 +8,7 @@ class D3D12_Simple_Triangle(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -18,7 +18,7 @@ class D3D12_Simple_Triangle(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py b/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py index a184659bd..0e869ba43 100644 --- a/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Swapchain_Zoo.py @@ -8,13 +8,13 @@ class D3D12_Swapchain_Zoo(rdtest.TestCase): action1 = self.find_action("Draw 1") action2 = self.find_action("Draw 2") - self.controller.SetFrameEvent(action1.nextAction.eventId, False) + self.set_event(action1.nextAction.eventId, False) self.check_triangle(back=[0.0, 0.0, 0.0, 1.0]) rdtest.log.success("Triangle in first action (on first window) is OK") - self.controller.SetFrameEvent(action2.nextAction.eventId, False) + self.set_event(action2.nextAction.eventId, False) self.check_triangle(back=[0.0, 0.0, 0.0, 1.0]) diff --git a/util/test/tests/D3D12/D3D12_Texture_Zoo.py b/util/test/tests/D3D12/D3D12_Texture_Zoo.py index db704413f..63e521df3 100644 --- a/util/test/tests/D3D12/D3D12_Texture_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Texture_Zoo.py @@ -13,5 +13,5 @@ class D3D12_Texture_Zoo(rdtest.TestCase): assert self.controller is not None # This takes ownership of the controller and shuts it down when it's finished self.zoo_helper.worker_thread = self.worker_thread - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) self.controller = None diff --git a/util/test/tests/D3D12/D3D12_Untyped_Backbuffer_Descriptor.py b/util/test/tests/D3D12/D3D12_Untyped_Backbuffer_Descriptor.py index 5c30976d4..1a87e21e0 100644 --- a/util/test/tests/D3D12/D3D12_Untyped_Backbuffer_Descriptor.py +++ b/util/test/tests/D3D12/D3D12_Untyped_Backbuffer_Descriptor.py @@ -8,7 +8,7 @@ class D3D12_Untyped_Backbuffer_Descriptor(rdtest.TestCase): # find the first action action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -19,7 +19,7 @@ class D3D12_Untyped_Backbuffer_Descriptor(rdtest.TestCase): # find the second action action = self.find_action("Draw", action.eventId+1) - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_VRS.py b/util/test/tests/D3D12/D3D12_VRS.py index ff25d3052..c78aa930f 100644 --- a/util/test/tests/D3D12/D3D12_VRS.py +++ b/util/test/tests/D3D12/D3D12_VRS.py @@ -49,7 +49,7 @@ class D3D12_VRS(rdtest.TestCase): action = self.find_action("Default", pass_action.eventId) assert action is not None - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) num_checks = 0 @@ -57,39 +57,39 @@ class D3D12_VRS(rdtest.TestCase): num_checks += 1 action = self.find_action("Base", pass_action.eventId) - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 action = self.find_action("Vertex", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("1x1", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 rdtest.log.success("Shading rates were as expected in per-vertex case") action = self.find_action("Image", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "1x1"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 rdtest.log.success("Shading rates were as expected in image-based case") action = self.find_action("Base + Vertex", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 action = self.find_action("Base + Image", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 action = self.find_action("Vertex + Image", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 diff --git a/util/test/tests/D3D12/D3D12_Vertex_Attr_Zoo.py b/util/test/tests/D3D12/D3D12_Vertex_Attr_Zoo.py index 7859de886..9bafac92b 100644 --- a/util/test/tests/D3D12/D3D12_Vertex_Attr_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Vertex_Attr_Zoo.py @@ -11,7 +11,7 @@ class D3D12_Vertex_Attr_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/D3D12/D3D12_Vertex_UAV.py b/util/test/tests/D3D12/D3D12_Vertex_UAV.py index 4b307351a..6031118c4 100644 --- a/util/test/tests/D3D12/D3D12_Vertex_UAV.py +++ b/util/test/tests/D3D12/D3D12_Vertex_UAV.py @@ -22,7 +22,7 @@ class D3D12_Vertex_UAV(rdtest.TestCase): rdtest.log.print(f"Checking quad overdraw on {name}") - self.controller.SetFrameEvent(marker.nextAction.eventId, True) + self.set_event(marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/D3D12/D3D12_Write_Subresource.py b/util/test/tests/D3D12/D3D12_Write_Subresource.py index a4d6da456..c22384288 100644 --- a/util/test/tests/D3D12/D3D12_Write_Subresource.py +++ b/util/test/tests/D3D12/D3D12_Write_Subresource.py @@ -7,7 +7,7 @@ class D3D12_Write_Subresource(rdtest.TestCase): def check_capture(self): action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_Buffer_Resizing.py b/util/test/tests/GL/GL_Buffer_Resizing.py index 3fe414a66..a3aaac543 100644 --- a/util/test/tests/GL/GL_Buffer_Resizing.py +++ b/util/test/tests/GL/GL_Buffer_Resizing.py @@ -44,7 +44,7 @@ class GL_Buffer_Resizing(rdtest.TestCase): if action is None: break - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.check_triangle(out=action.outputs[0]) diff --git a/util/test/tests/GL/GL_Buffer_Spam.py b/util/test/tests/GL/GL_Buffer_Spam.py index a36aab45e..616b5bb19 100644 --- a/util/test/tests/GL/GL_Buffer_Spam.py +++ b/util/test/tests/GL/GL_Buffer_Spam.py @@ -10,7 +10,7 @@ class GL_Buffer_Spam(rdtest.TestCase): action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we get green in the centre of the screen, indicating that the # triangle's buffer serialised with the right data and rendered diff --git a/util/test/tests/GL/GL_Buffer_Updates.py b/util/test/tests/GL/GL_Buffer_Updates.py index 5b3c60d89..27297fb02 100644 --- a/util/test/tests/GL/GL_Buffer_Updates.py +++ b/util/test/tests/GL/GL_Buffer_Updates.py @@ -11,7 +11,7 @@ class GL_Buffer_Updates(rdtest.TestCase): # At each action, the centre pixel of the viewport should be green action = self.get_first_action() while action is not None: - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) if action.flags & rd.ActionFlags.Drawcall: pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_CBuffer_Zoo.py b/util/test/tests/GL/GL_CBuffer_Zoo.py index f60a910ef..785e583de 100644 --- a/util/test/tests/GL/GL_CBuffer_Zoo.py +++ b/util/test/tests/GL/GL_CBuffer_Zoo.py @@ -12,7 +12,7 @@ class GL_CBuffer_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_DX_Interop.py b/util/test/tests/GL/GL_DX_Interop.py index 60d6431a3..3f3d41a79 100644 --- a/util/test/tests/GL/GL_DX_Interop.py +++ b/util/test/tests/GL/GL_DX_Interop.py @@ -8,7 +8,7 @@ class GL_DX_Interop(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) out = last_action.copyDestination diff --git a/util/test/tests/GL/GL_Depth_Bounds.py b/util/test/tests/GL/GL_Depth_Bounds.py index 671aac8fa..5f7c52898 100644 --- a/util/test/tests/GL/GL_Depth_Bounds.py +++ b/util/test/tests/GL/GL_Depth_Bounds.py @@ -6,7 +6,7 @@ class GL_Depth_Bounds(rdtest.TestCase): def check_capture(self): eid = self.find_action("Test").nextAction.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) glpipe = self.controller.GetGLPipelineState() diff --git a/util/test/tests/GL/GL_Discard_Zoo.py b/util/test/tests/GL/GL_Discard_Zoo.py index cbbc78028..0d0d6c741 100644 --- a/util/test/tests/GL/GL_Discard_Zoo.py +++ b/util/test/tests/GL/GL_Discard_Zoo.py @@ -16,7 +16,7 @@ class GL_Discard_Zoo(rdtest.Discard_Zoo): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Check the buffer for res in self.controller.GetResources(): @@ -29,7 +29,7 @@ class GL_Discard_Zoo(rdtest.Discard_Zoo): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Check the buffer for res in self.controller.GetResources(): diff --git a/util/test/tests/GL/GL_Draw_Zoo.py b/util/test/tests/GL/GL_Draw_Zoo.py index a4f26c681..66c458574 100644 --- a/util/test/tests/GL/GL_Draw_Zoo.py +++ b/util/test/tests/GL/GL_Draw_Zoo.py @@ -15,7 +15,7 @@ class GL_Draw_Zoo(rdtest.Draw_Zoo): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() @@ -31,7 +31,7 @@ class GL_Draw_Zoo(rdtest.Draw_Zoo): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_Frame0.py b/util/test/tests/GL/GL_Frame0.py index 67d83d110..c1a1eddbe 100644 --- a/util/test/tests/GL/GL_Frame0.py +++ b/util/test/tests/GL/GL_Frame0.py @@ -21,7 +21,7 @@ class GL_Frame0(rdtest.TestCase): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -31,7 +31,7 @@ class GL_Frame0(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/GL/GL_Large_Buffer.py b/util/test/tests/GL/GL_Large_Buffer.py index 8c8fb486b..cc9b63369 100644 --- a/util/test/tests/GL/GL_Large_Buffer.py +++ b/util/test/tests/GL/GL_Large_Buffer.py @@ -10,7 +10,7 @@ class GL_Large_Buffer(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vsin_ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/GL/GL_Mesh_Zoo.py b/util/test/tests/GL/GL_Mesh_Zoo.py index 990ddc356..77ca353aa 100644 --- a/util/test/tests/GL/GL_Mesh_Zoo.py +++ b/util/test/tests/GL/GL_Mesh_Zoo.py @@ -11,12 +11,12 @@ class GL_Mesh_Zoo(rdtest.TestCase): def check_capture(self): assert self.controller is not None - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) # Test GL-only thing with geometry shader only and completely no-op vertex shader action = self.zoo_helper.find_action("Geom Only").nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pos = self.controller.GetPostVSData(0, 0, rd.MeshDataStage.VSOut) @@ -44,13 +44,13 @@ class GL_Mesh_Zoo(rdtest.TestCase): # Test GL-only thing with geometry shader only and completely no-op vertex shader multibase = self.zoo_helper.find_action("Multi Draw").nextAction.parent - self.controller.SetFrameEvent(multibase.children[-1].eventId, False) + self.set_event(multibase.children[-1].eventId, False) baseVertex = [10, 11] baseInstance = [20, 22] for d, action in enumerate(multibase.children): - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_Multithread_Rendering.py b/util/test/tests/GL/GL_Multithread_Rendering.py index ead5558c0..092103f79 100644 --- a/util/test/tests/GL/GL_Multithread_Rendering.py +++ b/util/test/tests/GL/GL_Multithread_Rendering.py @@ -7,7 +7,7 @@ class GL_Multithread_Rendering(rdtest.TestCase): def check_capture(self): action = self.get_last_action() - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_Parameter_Zoo.py b/util/test/tests/GL/GL_Parameter_Zoo.py index cce7b8628..347253a02 100644 --- a/util/test/tests/GL/GL_Parameter_Zoo.py +++ b/util/test/tests/GL/GL_Parameter_Zoo.py @@ -13,7 +13,7 @@ class GL_Parameter_Zoo(rdtest.TestCase): tex_details = self.get_texture(id) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) data = self.controller.GetTextureData(id, rd.Subresource(0, 0, 0)) first_pixel = struct.unpack_from("BBBB", data, 0) @@ -33,7 +33,7 @@ class GL_Parameter_Zoo(rdtest.TestCase): img_path = rdtest.get_tmp_path('preserved_alpha.png') - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) save_data = rd.TextureSave() save_data.resourceId = id @@ -54,7 +54,7 @@ class GL_Parameter_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/GL/GL_Per_Type_Tex_Units.py b/util/test/tests/GL/GL_Per_Type_Tex_Units.py index 0f0c1bceb..ff519a0ad 100644 --- a/util/test/tests/GL/GL_Per_Type_Tex_Units.py +++ b/util/test/tests/GL/GL_Per_Type_Tex_Units.py @@ -9,7 +9,7 @@ class GL_Per_Type_Tex_Units(rdtest.TestCase): def check_capture(self): action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_Queries_In_Use.py b/util/test/tests/GL/GL_Queries_In_Use.py index 49ea73540..d2f268ace 100644 --- a/util/test/tests/GL/GL_Queries_In_Use.py +++ b/util/test/tests/GL/GL_Queries_In_Use.py @@ -8,14 +8,14 @@ class GL_Queries_In_Use(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tex_details = self.get_texture(last_action.copyDestination) action = self.find_action("XFB Draw").nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/GL/GL_Renderbuffer_Zoo.py b/util/test/tests/GL/GL_Renderbuffer_Zoo.py index 248120d8d..eb9da55ca 100644 --- a/util/test/tests/GL/GL_Renderbuffer_Zoo.py +++ b/util/test/tests/GL/GL_Renderbuffer_Zoo.py @@ -11,7 +11,7 @@ class GL_Renderbuffer_Zoo(rdtest.TestCase): action = self.find_action('glDraw') while action is not None: - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.check_triangle(fore=[0.2, 0.75, 0.2, 1.0]) diff --git a/util/test/tests/GL/GL_Resource_Lifetimes.py b/util/test/tests/GL/GL_Resource_Lifetimes.py index 700318de7..ef3d23d75 100644 --- a/util/test/tests/GL/GL_Resource_Lifetimes.py +++ b/util/test/tests/GL/GL_Resource_Lifetimes.py @@ -9,7 +9,7 @@ class GL_Resource_Lifetimes(rdtest.TestCase): def check_capture(self): action = self.find_action("glDraw") - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() @@ -23,7 +23,7 @@ class GL_Resource_Lifetimes(rdtest.TestCase): action = self.find_action("glDraw", action.eventId+1) - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() @@ -38,7 +38,7 @@ class GL_Resource_Lifetimes(rdtest.TestCase): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tex = last_action.copyDestination diff --git a/util/test/tests/GL/GL_Separable_Geometry_Shaders.py b/util/test/tests/GL/GL_Separable_Geometry_Shaders.py index cc2ebe9d8..2f20a4744 100644 --- a/util/test/tests/GL/GL_Separable_Geometry_Shaders.py +++ b/util/test/tests/GL/GL_Separable_Geometry_Shaders.py @@ -8,7 +8,7 @@ class GL_Separable_Geometry_Shaders(rdtest.TestCase): def check_capture(self): action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) assert action is not None diff --git a/util/test/tests/GL/GL_Shader_Debug_Zoo.py b/util/test/tests/GL/GL_Shader_Debug_Zoo.py index 32bde62fb..f57af1b61 100644 --- a/util/test/tests/GL/GL_Shader_Debug_Zoo.py +++ b/util/test/tests/GL/GL_Shader_Debug_Zoo.py @@ -26,7 +26,7 @@ class GL_Shader_Debug_Zoo(rdtest.TestCase): x += 4 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Vertex).debugInfo.debuggable: diff --git a/util/test/tests/GL/GL_Shader_Editing.py b/util/test/tests/GL/GL_Shader_Editing.py index 3b8628e40..d15830d91 100644 --- a/util/test/tests/GL/GL_Shader_Editing.py +++ b/util/test/tests/GL/GL_Shader_Editing.py @@ -7,14 +7,14 @@ class GL_Shader_Editing(rdtest.TestCase): def check_capture(self): eid = self.find_action("fixedprog").eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() fixedrefl = pipe.GetShaderReflection(rd.ShaderStage.Fragment) eid = self.find_action("dynamicprog").eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() @@ -22,13 +22,13 @@ class GL_Shader_Editing(rdtest.TestCase): vsrefl = pipe.GetShaderReflection(rd.ShaderStage.Vertex) eid = self.find_action("sepprog").eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) vsseprefl = pipe.GetShaderReflection(rd.ShaderStage.Vertex) fsseprefl = pipe.GetShaderReflection(rd.ShaderStage.Fragment) # Work at the last action, where the uniforms have been trashed - self.controller.SetFrameEvent(self.get_last_action().eventId, False) + self.set_event(self.get_last_action().eventId, False) tex = pipe.GetOutputTargets()[0].resource @@ -135,7 +135,7 @@ class GL_Shader_Editing(rdtest.TestCase): self.controller.ReplaceResource(dynamicrefl.resourceId, dynamicFS) # Refresh the replay if it didn't happen already - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Triangles have green propagated across to the blue channel self.check_pixel_value(tex, 0.25, 0.25, [0.0, 1.0, 1.0, 1.0]) @@ -146,7 +146,7 @@ class GL_Shader_Editing(rdtest.TestCase): # Now "edit" the VS but don't change it. We should still get the same values self.controller.ReplaceResource(vsrefl.resourceId, nochangeVS) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Triangles have green propagated across to the blue channel self.check_pixel_value(tex, 0.25, 0.25, [0.0, 1.0, 1.0, 1.0]) @@ -157,7 +157,7 @@ class GL_Shader_Editing(rdtest.TestCase): # Change the VS to one that has offset the triangles off-centre self.controller.ReplaceResource(vsrefl.resourceId, offsetVS) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Original sample positions are now the clear color self.check_pixel_value(tex, 0.25, 0.25, [0.2, 0.2, 0.2, 1.0]) @@ -173,7 +173,7 @@ class GL_Shader_Editing(rdtest.TestCase): # Now undo the first FS edit self.controller.RemoveReplacement(fixedrefl.resourceId) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Original sample positions are still the clear color self.check_pixel_value(tex, 0.25, 0.25, [0.2, 0.2, 0.2, 1.0]) @@ -189,7 +189,7 @@ class GL_Shader_Editing(rdtest.TestCase): # Now undo the first VS edit self.controller.RemoveReplacement(vsrefl.resourceId) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Only the lower triangle is the edited colour, but they are back in the original positions self.check_pixel_value(tex, 0.25, 0.25, [0.0, 1.0, 0.0, 1.0]) @@ -200,7 +200,7 @@ class GL_Shader_Editing(rdtest.TestCase): # finally undo the second FS edit self.controller.RemoveReplacement(dynamicrefl.resourceId) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # We should be back to where we started self.check_pixel_value(tex, 0.25, 0.25, [0.0, 1.0, 0.0, 1.0]) @@ -217,27 +217,27 @@ class GL_Shader_Editing(rdtest.TestCase): self.check_pixel_value(tex, 0.75, 0.75, [0.0, 1.0, 0.0, 1.0]) self.controller.ReplaceResource(fsseprefl.resourceId, sepFS) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Now it should be green-blue self.check_pixel_value(tex, 0.75, 0.75, [0.0, 1.0, 1.0, 1.0]) self.controller.ReplaceResource(vsseprefl.resourceId, sepVS) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Now it should be green-blue and offset self.check_pixel_value(tex, 0.75, 0.75, [0.2, 0.2, 0.2, 1.0]) self.check_pixel_value(tex, 0.95, 0.55, [0.0, 1.0, 1.0, 1.0]) self.controller.RemoveReplacement(fsseprefl.resourceId) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # Now it should be back to green and offset self.check_pixel_value(tex, 0.75, 0.75, [0.2, 0.2, 0.2, 1.0]) self.check_pixel_value(tex, 0.95, 0.55, [0.0, 1.0, 0.0, 1.0]) self.controller.RemoveReplacement(vsseprefl.resourceId) - self.controller.SetFrameEvent(self.get_last_action().eventId, True) + self.set_event(self.get_last_action().eventId, True) # We should be back to where we started self.check_pixel_value(tex, 0.75, 0.75, [0.0, 1.0, 0.0, 1.0]) diff --git a/util/test/tests/GL/GL_Shader_ISA.py b/util/test/tests/GL/GL_Shader_ISA.py index cb53a21af..12f5fd558 100644 --- a/util/test/tests/GL/GL_Shader_ISA.py +++ b/util/test/tests/GL/GL_Shader_ISA.py @@ -12,7 +12,7 @@ class GL_Shader_ISA(rdtest.TestCase): is_amd = 'AMD' in action.customName - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_Simple_Triangle.py b/util/test/tests/GL/GL_Simple_Triangle.py index 233de624f..c3fabda2e 100644 --- a/util/test/tests/GL/GL_Simple_Triangle.py +++ b/util/test/tests/GL/GL_Simple_Triangle.py @@ -8,7 +8,7 @@ class GL_Simple_Triangle(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -18,7 +18,7 @@ class GL_Simple_Triangle(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/GL/GL_State_Trashing.py b/util/test/tests/GL/GL_State_Trashing.py index 8bc60177f..ae5d2a47b 100644 --- a/util/test/tests/GL/GL_State_Trashing.py +++ b/util/test/tests/GL/GL_State_Trashing.py @@ -8,7 +8,7 @@ class GL_State_Trashing(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -16,7 +16,7 @@ class GL_State_Trashing(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/GL/GL_Texture_Zoo.py b/util/test/tests/GL/GL_Texture_Zoo.py index 730bcb00f..915632fed 100644 --- a/util/test/tests/GL/GL_Texture_Zoo.py +++ b/util/test/tests/GL/GL_Texture_Zoo.py @@ -13,5 +13,5 @@ class GL_Texture_Zoo(rdtest.TestCase): assert self.controller is not None # This takes ownership of the controller and shuts it down when it's finished self.zoo_helper.worker_thread = self.worker_thread - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) self.controller = None diff --git a/util/test/tests/GL/GL_Unshared_Context.py b/util/test/tests/GL/GL_Unshared_Context.py index 61a415d10..80589c985 100644 --- a/util/test/tests/GL/GL_Unshared_Context.py +++ b/util/test/tests/GL/GL_Unshared_Context.py @@ -9,7 +9,7 @@ class GL_Unshared_Context(rdtest.TestCase): action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/GL/GL_VAO_0.py b/util/test/tests/GL/GL_VAO_0.py index feceded82..6d556b691 100644 --- a/util/test/tests/GL/GL_VAO_0.py +++ b/util/test/tests/GL/GL_VAO_0.py @@ -12,7 +12,7 @@ class GL_VAO_0(rdtest.TestCase): for i in range(0, 4): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() vp = pipe.GetViewport(0) @@ -56,7 +56,7 @@ class GL_VAO_0(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Each instance should have color output of 0.5 * instance in blue for i in range(0, action.numInstances): diff --git a/util/test/tests/GL/GL_Vertex_Attr_Zoo.py b/util/test/tests/GL/GL_Vertex_Attr_Zoo.py index b88bcef42..798e7c12e 100644 --- a/util/test/tests/GL/GL_Vertex_Attr_Zoo.py +++ b/util/test/tests/GL/GL_Vertex_Attr_Zoo.py @@ -11,7 +11,7 @@ class GL_Vertex_Attr_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/Iter_Test.py b/util/test/tests/Iter_Test.py index cf0153cc6..6b43353e5 100644 --- a/util/test/tests/Iter_Test.py +++ b/util/test/tests/Iter_Test.py @@ -256,7 +256,7 @@ class Iter_Test(rdtest.TestCase): if lastmod is not None: rdtest.log.print(f"Debugging pixel {x},{y} @ {lastmod.eventId}, primitive {lastmod.primitiveID}") - self.controller.SetFrameEvent(lastmod.eventId, True) + self.set_event(lastmod.eventId, True) pipe = self.controller.GetPipelineState() @@ -330,7 +330,7 @@ class Iter_Test(rdtest.TestCase): # This could be an application error - undefined but seen in the wild rdtest.log.error(f"At EID {lastmod.eventId} No output variable declared for index {output_index}") - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) def mesh_output(self, action: rd.ActionDescription): self.controller.GetPostVSData(0, 0, rd.MeshDataStage.VSOut) @@ -401,7 +401,7 @@ class Iter_Test(rdtest.TestCase): while action: rdtest.log.print(f"{action.eventId}/{last_action.eventId}") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) rdtest.log.print("Set event") diff --git a/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py b/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py index 4f003e493..f9b79db4b 100644 --- a/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py +++ b/util/test/tests/Vulkan/VK_Adv_CBuffer_Zoo.py @@ -10,7 +10,7 @@ class VK_Adv_CBuffer_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Blend_Pixel_History.py b/util/test/tests/Vulkan/VK_Blend_Pixel_History.py index e6b966e7b..7a57724aa 100644 --- a/util/test/tests/Vulkan/VK_Blend_Pixel_History.py +++ b/util/test/tests/Vulkan/VK_Blend_Pixel_History.py @@ -22,7 +22,7 @@ class VK_Blend_Pixel_History(rdtest.TestCase): def primary_test(self): test_marker = self.find_action("Test End") - self.controller.SetFrameEvent(test_marker.eventId, True) + self.set_event(test_marker.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_CBuffer_Zoo.py b/util/test/tests/Vulkan/VK_CBuffer_Zoo.py index 9e5d15adb..b6bc0e09f 100644 --- a/util/test/tests/Vulkan/VK_CBuffer_Zoo.py +++ b/util/test/tests/Vulkan/VK_CBuffer_Zoo.py @@ -10,7 +10,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -81,7 +81,7 @@ class VK_CBuffer_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Compute_Only.py b/util/test/tests/Vulkan/VK_Compute_Only.py index 9f37cfc2a..02915408a 100644 --- a/util/test/tests/Vulkan/VK_Compute_Only.py +++ b/util/test/tests/Vulkan/VK_Compute_Only.py @@ -12,7 +12,7 @@ class VK_Compute_Only(rdtest.TestCase): self.check_pixel_value(tex, 0, 0, [0.25, 0.5, 0.75, 1.0]) - self.controller.SetFrameEvent(self.find_action("Pre-Dispatch").eventId, True) + self.set_event(self.find_action("Pre-Dispatch").eventId, True) uints = struct.unpack_from('=4L', self.controller.GetBufferData(bufin, 0, 0), 0) @@ -26,7 +26,7 @@ class VK_Compute_Only(rdtest.TestCase): raise rdtest.TestFailureException( f'bufout data is incorrect before dispatch: {uints}') - self.controller.SetFrameEvent(self.find_action("Post-Dispatch").eventId, True) + self.set_event(self.find_action("Post-Dispatch").eventId, True) uints = struct.unpack_from('=4L', self.controller.GetBufferData(bufout, 0, 0), 0) diff --git a/util/test/tests/Vulkan/VK_Custom_Resolve.py b/util/test/tests/Vulkan/VK_Custom_Resolve.py index eb99b04a3..5a8ff4626 100644 --- a/util/test/tests/Vulkan/VK_Custom_Resolve.py +++ b/util/test/tests/Vulkan/VK_Custom_Resolve.py @@ -29,7 +29,7 @@ class VK_Custom_Resolve(rdtest.TestCase): def check_resource_usage(self, markerName: str, expectedUsages: List[rd.ResourceUsage]): action = self.find_action(markerName) - self.controller.SetFrameEvent(action.eventId+1, True) + self.set_event(action.eventId+1, True) pipe = self.controller.GetPipelineState() out = pipe.GetOutputTargets()[0].resource usages = self.controller.GetUsage(out) @@ -141,7 +141,7 @@ class VK_Custom_Resolve(rdtest.TestCase): assert action is not None rdtest.log.print(f'MSAA Draw: {self.action_name(action)} EID:{action.eventId}') - self.controller.SetFrameEvent(action.eventId+1, True) + self.set_event(action.eventId+1, True) self.check_triangle_draw() self.check_debug_pixel(200, 150) # Clear : Draw @@ -176,7 +176,7 @@ class VK_Custom_Resolve(rdtest.TestCase): assert action is not None rdtest.log.print(f'MSAA Resolve: {self.action_name(action)} EID:{action.eventId}') - self.controller.SetFrameEvent(action.eventId+1, True) + self.set_event(action.eventId+1, True) self.check_triangle_resolve() self.check_debug_pixel(200, 150) self.check_debug_pixel(150, 149) diff --git a/util/test/tests/Vulkan/VK_Dedicated_Allocation.py b/util/test/tests/Vulkan/VK_Dedicated_Allocation.py index 61f5bde11..083b83908 100644 --- a/util/test/tests/Vulkan/VK_Dedicated_Allocation.py +++ b/util/test/tests/Vulkan/VK_Dedicated_Allocation.py @@ -10,7 +10,7 @@ class VK_Dedicated_Allocation(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/Vulkan/VK_Descriptor_Buffer.py b/util/test/tests/Vulkan/VK_Descriptor_Buffer.py index e50cef988..61c4e4b98 100644 --- a/util/test/tests/Vulkan/VK_Descriptor_Buffer.py +++ b/util/test/tests/Vulkan/VK_Descriptor_Buffer.py @@ -22,7 +22,7 @@ class VK_Descriptor_Buffer(rdtest.TestCase): eid = draw.eventId - self.controller.SetFrameEvent(draw.nextAction.eventId, False) + self.set_event(draw.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Descriptor_Indexing.py b/util/test/tests/Vulkan/VK_Descriptor_Indexing.py index b5ecc2da2..b338b2574 100644 --- a/util/test/tests/Vulkan/VK_Descriptor_Indexing.py +++ b/util/test/tests/Vulkan/VK_Descriptor_Indexing.py @@ -12,7 +12,7 @@ class VK_Descriptor_Indexing(rdtest.TestCase): action = self.find_action("Dispatch") assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() vkpipe = self.controller.GetVulkanPipelineState() @@ -42,7 +42,7 @@ class VK_Descriptor_Indexing(rdtest.TestCase): action = self.find_action("Draw") assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() vkpipe = self.controller.GetVulkanPipelineState() diff --git a/util/test/tests/Vulkan/VK_Descriptor_Reuse.py b/util/test/tests/Vulkan/VK_Descriptor_Reuse.py index 7af06003f..a9dfe7f72 100644 --- a/util/test/tests/Vulkan/VK_Descriptor_Reuse.py +++ b/util/test/tests/Vulkan/VK_Descriptor_Reuse.py @@ -10,7 +10,7 @@ class VK_Descriptor_Reuse(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) action = self.find_action('Duration') diff --git a/util/test/tests/Vulkan/VK_Descriptor_Variable_Count.py b/util/test/tests/Vulkan/VK_Descriptor_Variable_Count.py index d1000e49a..a3e855c2c 100644 --- a/util/test/tests/Vulkan/VK_Descriptor_Variable_Count.py +++ b/util/test/tests/Vulkan/VK_Descriptor_Variable_Count.py @@ -7,6 +7,6 @@ class VK_Descriptor_Variable_Count(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) diff --git a/util/test/tests/Vulkan/VK_Discard_Zoo.py b/util/test/tests/Vulkan/VK_Discard_Zoo.py index 1da7f811d..6076c1bd4 100644 --- a/util/test/tests/Vulkan/VK_Discard_Zoo.py +++ b/util/test/tests/Vulkan/VK_Discard_Zoo.py @@ -22,7 +22,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo): assert action is not None - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) # At the start they should be cleared @@ -35,7 +35,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo): action = self.find_action("TestMiddle") - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) for y in range(0, rpcol.height-1, 17): for x in range(0, rpcol.width-1, 17): @@ -69,7 +69,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo): action = self.find_action("TestEnd") - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) for y in range(0, rpcol.height-1, 17): for x in range(0, rpcol.width-1, 17): @@ -106,7 +106,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo): action = self.find_action("UndefinedLoad_Before") - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) # check that they are cleared again for y in range(0, rpcol.height-1, 17): @@ -118,7 +118,7 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo): action = self.find_action("UndefinedLoad_After") - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) # check that they are all undefined pattern - initial layout affects the whole resource for y in range(0, rpcol.height-1, 17): @@ -144,14 +144,14 @@ class VK_Discard_Zoo(rdtest.Discard_Zoo): action = self.find_action("CmdDraw") assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() tex_id = pipe.GetOutputTargets()[0].resource self.check_pixel_value(tex_id, 0.5, 0.5, [0.0, 1.0, 0.0, 1.0]) - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) self.check_pixel_value(tex_id, 0.5, 0.5, [0.0, 1.0, 0.0, 1.0]) rdtest.log.success("Output value from draw is correct at draw and after it") diff --git a/util/test/tests/Vulkan/VK_Dynamic_Rendering.py b/util/test/tests/Vulkan/VK_Dynamic_Rendering.py index d7f4efabb..76c8412f1 100644 --- a/util/test/tests/Vulkan/VK_Dynamic_Rendering.py +++ b/util/test/tests/Vulkan/VK_Dynamic_Rendering.py @@ -15,7 +15,7 @@ class VK_Dynamic_Rendering(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postgs_data = self.get_postvs(action, rd.MeshDataStage.GSOut, 0, action.numIndices) diff --git a/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py b/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py index 8354f6f97..029e68425 100644 --- a/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py +++ b/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py @@ -10,7 +10,7 @@ class VK_Extended_Dynamic_State(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) vsin_ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/Vulkan/VK_Frame0.py b/util/test/tests/Vulkan/VK_Frame0.py index 504d03644..501f59158 100644 --- a/util/test/tests/Vulkan/VK_Frame0.py +++ b/util/test/tests/Vulkan/VK_Frame0.py @@ -21,7 +21,7 @@ class VK_Frame0(rdtest.TestCase): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -31,7 +31,7 @@ class VK_Frame0(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/Vulkan/VK_Graphics_Pipeline.py b/util/test/tests/Vulkan/VK_Graphics_Pipeline.py index cf6540175..4ec3afd9f 100644 --- a/util/test/tests/Vulkan/VK_Graphics_Pipeline.py +++ b/util/test/tests/Vulkan/VK_Graphics_Pipeline.py @@ -8,7 +8,7 @@ class VK_Graphics_Pipeline(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tri_col = [0.408, 0.863, 0.182, 1.0] @@ -20,7 +20,7 @@ class VK_Graphics_Pipeline(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) @@ -151,7 +151,7 @@ class VK_Graphics_Pipeline(rdtest.TestCase): self.controller.ReplaceResource(vsrefl.resourceId, newShader[0]) # Refresh the replay if it didn't happen already - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tri_col2 = [0.906, 0.361, 0.182, 1.0] self.check_triangle(out=last_action.copyDestination, fore=tri_col2) diff --git a/util/test/tests/Vulkan/VK_Image_Layouts.py b/util/test/tests/Vulkan/VK_Image_Layouts.py index 69f139be4..3bd9d150a 100644 --- a/util/test/tests/Vulkan/VK_Image_Layouts.py +++ b/util/test/tests/Vulkan/VK_Image_Layouts.py @@ -14,7 +14,7 @@ class VK_Image_Layouts(rdtest.TestCase): return opts def check_capture(self): - self.controller.SetFrameEvent(0, False) + self.set_event(0, False) pipe = self.controller.GetVulkanPipelineState() @@ -35,7 +35,7 @@ class VK_Image_Layouts(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetVulkanPipelineState() @@ -59,7 +59,7 @@ class VK_Image_Layouts(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetVulkanPipelineState() @@ -84,7 +84,7 @@ class VK_Image_Layouts(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId+1, False) + self.set_event(action.eventId+1, False) pipe = self.controller.GetVulkanPipelineState() @@ -98,7 +98,7 @@ class VK_Image_Layouts(rdtest.TestCase): self.check_pixel_value(img.resourceId, 0, 0, [0.8, 0.8, 0.8, 1.0], eps=0.01) # finally check that it has reset to the correct value back at the start of the frame - self.controller.SetFrameEvent(1, False) + self.set_event(1, False) pipe = self.controller.GetVulkanPipelineState() diff --git a/util/test/tests/Vulkan/VK_Imageless_Framebuffer.py b/util/test/tests/Vulkan/VK_Imageless_Framebuffer.py index c891c472a..6606c18de 100644 --- a/util/test/tests/Vulkan/VK_Imageless_Framebuffer.py +++ b/util/test/tests/Vulkan/VK_Imageless_Framebuffer.py @@ -9,7 +9,7 @@ class VK_Imageless_Framebuffer(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Indirect.py b/util/test/tests/Vulkan/VK_Indirect.py index a636cca60..cc742702b 100644 --- a/util/test/tests/Vulkan/VK_Indirect.py +++ b/util/test/tests/Vulkan/VK_Indirect.py @@ -148,7 +148,7 @@ class VK_Indirect(rdtest.TestCase): raise rdtest.TestFailureException(f"Triangle Size Draw and Pass do not match: {pickedDraw.floatValue} vs {pickedPass.floatValue}") def check_overlay_and_pixel_history(self, eid: int, coords: List[Tuple[int,int]]): - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) for c in coords: x = c[0] y = c[1] @@ -265,7 +265,7 @@ class VK_Indirect(rdtest.TestCase): assert empties is not None for action in real_action_children(empties): eid = action.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() for overlay in rd.DebugOverlay: if overlay == rd.DebugOverlay.NoOverlay: @@ -343,7 +343,7 @@ class VK_Indirect(rdtest.TestCase): indirect_count_root = self.find_action(f"{level}: KHR_draw_indirect_count") - self.controller.SetFrameEvent(final.eventId, False) + self.set_event(final.eventId, False) # Check the top row, non indirect count and always present self.check_pixel_value(tex, 60, 60, [1.0, 0.0, 0.0, 1.0]) @@ -378,7 +378,7 @@ class VK_Indirect(rdtest.TestCase): # Ensure we can select all actions while action is not None: - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) action = action.nextAction rdtest.log.success(f"Selected all {level} actions") @@ -391,7 +391,7 @@ class VK_Indirect(rdtest.TestCase): rdtest.log.success(f"{level} Indirect dispatches are the correct dimensions") - self.controller.SetFrameEvent(dispatches.children[2].eventId, False) + self.set_event(dispatches.children[2].eventId, False) pipe = self.controller.GetPipelineState() @@ -420,7 +420,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 0 assert action.numInstances == 0 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we have empty PostVS postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, 1) @@ -444,7 +444,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 3 assert action.numInstances == 2 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) assert rd.ResourceUsage.Indirect in buffer_usage[action.eventId] @@ -471,7 +471,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 3 assert action.numInstances == 3 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we have PostVS as expected postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut) @@ -496,7 +496,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 6 assert action.numInstances == 2 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we have PostVS as expected postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut) @@ -531,7 +531,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 0 assert action.numInstances == 0 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we have empty PostVS postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, 1) @@ -552,7 +552,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 3 assert action.numInstances == 4 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we have PostVS as expected postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut) @@ -582,7 +582,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 3 assert action.numInstances == 1 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we have PostVS as expected postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut) @@ -607,7 +607,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 0 assert action.numInstances == 0 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut) @@ -622,7 +622,7 @@ class VK_Indirect(rdtest.TestCase): assert action.numIndices == 6 assert action.numInstances == 2 - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that we have PostVS as expected postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut) @@ -647,11 +647,11 @@ class VK_Indirect(rdtest.TestCase): rdtest.log.success(f"{level} {action.customName} is as expected") # Now check that the draws post-count are correctly highlighted - self.controller.SetFrameEvent(self.find_action(f"{level}: Post-count 1").children[0].eventId, False) + self.set_event(self.find_action(f"{level}: Post-count 1").children[0].eventId, False) self.check_overlay([(340, 40)]) - self.controller.SetFrameEvent(self.find_action(f"{level}: Post-count 2").children[0].eventId, False) + self.set_event(self.find_action(f"{level}: Post-count 2").children[0].eventId, False) self.check_overlay([(340, 190)]) - self.controller.SetFrameEvent(self.find_action(f"{level}: Post-count 3").children[0].eventId, False) + self.set_event(self.find_action(f"{level}: Post-count 3").children[0].eventId, False) self.check_overlay([(340, 115)]) else: rdtest.log.print("KHR_draw_indirect_count not tested") @@ -661,7 +661,7 @@ class VK_Indirect(rdtest.TestCase): with rdtest.log.auto_section('Checking All Overlays'): for eid in range(self.get_first_action().eventId, self.get_last_action().eventId + 1): - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() if len(pipe.GetOutputTargets()) == 0: continue diff --git a/util/test/tests/Vulkan/VK_Int8_IBuffer.py b/util/test/tests/Vulkan/VK_Int8_IBuffer.py index 7e9656fc2..8c53ed8f4 100644 --- a/util/test/tests/Vulkan/VK_Int8_IBuffer.py +++ b/util/test/tests/Vulkan/VK_Int8_IBuffer.py @@ -10,7 +10,7 @@ class VK_Int8_IBuffer(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py b/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py index b945a94f6..14225e01c 100644 --- a/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py +++ b/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py @@ -17,7 +17,7 @@ class VK_KHR_Buffer_Address(rdtest.TestCase): action = self.find_action(test_name) action = action.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Pixel).debugInfo.debuggable: diff --git a/util/test/tests/Vulkan/VK_Large_Buffer.py b/util/test/tests/Vulkan/VK_Large_Buffer.py index dee563774..bec2f64a7 100644 --- a/util/test/tests/Vulkan/VK_Large_Buffer.py +++ b/util/test/tests/Vulkan/VK_Large_Buffer.py @@ -10,7 +10,7 @@ class VK_Large_Buffer(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vsin_ref: rdtest.MeshReference = { 0: { diff --git a/util/test/tests/Vulkan/VK_Line_Raster.py b/util/test/tests/Vulkan/VK_Line_Raster.py index 012bc063b..3a87e0aae 100644 --- a/util/test/tests/Vulkan/VK_Line_Raster.py +++ b/util/test/tests/Vulkan/VK_Line_Raster.py @@ -34,7 +34,7 @@ class VK_Line_Raster(rdtest.TestCase): action = action.previousAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Load_Store_None.py b/util/test/tests/Vulkan/VK_Load_Store_None.py index c6d5c77a9..8f2946693 100644 --- a/util/test/tests/Vulkan/VK_Load_Store_None.py +++ b/util/test/tests/Vulkan/VK_Load_Store_None.py @@ -11,7 +11,7 @@ class VK_Load_Store_None(rdtest.TestCase): self.find_action("Blit")]: assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.check_pixel_value(res, 200, 125, [0.0, 1.0, 0.0, 1.0]) self.check_pixel_value(res, 200, 90, [0.2, 0.2, 0.2, 1.0]) diff --git a/util/test/tests/Vulkan/VK_Mesh_Shader.py b/util/test/tests/Vulkan/VK_Mesh_Shader.py index e7cc11622..832981230 100644 --- a/util/test/tests/Vulkan/VK_Mesh_Shader.py +++ b/util/test/tests/Vulkan/VK_Mesh_Shader.py @@ -52,7 +52,7 @@ class VK_Mesh_Shader(rdtest.TestCase): assert self.controller is not None last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) action = self.find_action("Mesh Shaders") @@ -60,7 +60,7 @@ class VK_Mesh_Shader(rdtest.TestCase): assert action is not None name = f"Pure Mesh Shader Test EID:{action.eventId}" with rdtest.log.auto_section(name): - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) x = 70 y = 240 @@ -77,7 +77,7 @@ class VK_Mesh_Shader(rdtest.TestCase): assert action is not None name = f"Task Shader with Local Payload EID:{action.eventId}" with rdtest.log.auto_section(name): - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postts_ref = self.build_local_taskout_reference() postts_data = self.get_task_data(action) @@ -94,7 +94,7 @@ class VK_Mesh_Shader(rdtest.TestCase): with rdtest.log.auto_section(name): action = action.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) x = 290 y = 90 diff --git a/util/test/tests/Vulkan/VK_Mesh_Zoo.py b/util/test/tests/Vulkan/VK_Mesh_Zoo.py index 2a9da78bc..815d4a95b 100644 --- a/util/test/tests/Vulkan/VK_Mesh_Zoo.py +++ b/util/test/tests/Vulkan/VK_Mesh_Zoo.py @@ -14,13 +14,13 @@ class VK_Mesh_Zoo(rdtest.TestCase): def check_capture(self): assert self.controller is not None - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) xfbDraw = self.find_action("XFB") if xfbDraw is not None: assert xfbDraw.nextAction is not None - self.controller.SetFrameEvent(xfbDraw.nextAction.eventId, False) + self.set_event(xfbDraw.nextAction.eventId, False) postgs_data = self.get_postvs(xfbDraw.nextAction, rd.MeshDataStage.GSOut, 0, 4) @@ -57,7 +57,7 @@ class VK_Mesh_Zoo(rdtest.TestCase): xfbDraw = self.find_action("XFB After") - self.controller.SetFrameEvent(xfbDraw.eventId, False) + self.set_event(xfbDraw.eventId, False) xfb = self.controller.GetVulkanPipelineState().transformFeedback diff --git a/util/test/tests/Vulkan/VK_Misaligned_Dirty.py b/util/test/tests/Vulkan/VK_Misaligned_Dirty.py index b1a9bb170..5d1d2da58 100644 --- a/util/test/tests/Vulkan/VK_Misaligned_Dirty.py +++ b/util/test/tests/Vulkan/VK_Misaligned_Dirty.py @@ -23,7 +23,7 @@ class VK_Misaligned_Dirty(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) assert len(self.controller.GetFrameInfo().debugMessages) == 0 assert len(self.controller.GetDebugMessages()) == 0 @@ -98,19 +98,19 @@ class VK_Misaligned_Dirty(rdtest.TestCase): assert copy_src is not None assert vb is not None - self.controller.SetFrameEvent(checkpoint1.eventId, False) + self.set_event(checkpoint1.eventId, False) val = struct.unpack('f', self.controller.GetBufferData(copy_src, 116, 4)) assert val[0] == 11.0 - self.controller.SetFrameEvent(checkpoint2.eventId, False) + self.set_event(checkpoint2.eventId, False) val = struct.unpack('f', self.controller.GetBufferData(copy_src, 116, 4)) assert val[0] == 12.0 val = struct.unpack('f', self.controller.GetBufferData(vb, 116, 4)) assert val[0] == 12.0 - self.controller.SetFrameEvent(checkpoint3.eventId, False) + self.set_event(checkpoint3.eventId, False) val = struct.unpack('f', self.controller.GetBufferData(copy_src, 116, 4)) assert val[0] == 11.0 diff --git a/util/test/tests/Vulkan/VK_Multi_Entry.py b/util/test/tests/Vulkan/VK_Multi_Entry.py index 44c363121..09b5baf2a 100644 --- a/util/test/tests/Vulkan/VK_Multi_Entry.py +++ b/util/test/tests/Vulkan/VK_Multi_Entry.py @@ -8,7 +8,7 @@ class VK_Multi_Entry(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -18,7 +18,7 @@ class VK_Multi_Entry(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Multi_View.py b/util/test/tests/Vulkan/VK_Multi_View.py index 8981dc56e..ac46179a3 100644 --- a/util/test/tests/Vulkan/VK_Multi_View.py +++ b/util/test/tests/Vulkan/VK_Multi_View.py @@ -19,7 +19,7 @@ class VK_Multi_View(rdtest.TestCase): continue action = label.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Pixel).debugInfo.debuggable: @@ -57,7 +57,7 @@ class VK_Multi_View(rdtest.TestCase): continue action = label.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Pixel).debugInfo.debuggable: diff --git a/util/test/tests/Vulkan/VK_Overlay_Test.py b/util/test/tests/Vulkan/VK_Overlay_Test.py index bb5c8e7b3..f90cb58f7 100644 --- a/util/test/tests/Vulkan/VK_Overlay_Test.py +++ b/util/test/tests/Vulkan/VK_Overlay_Test.py @@ -11,7 +11,7 @@ class VK_Overlay_Test(rdtest.Overlay_Test): out = self.controller.CreateOutput(rd.CreateHeadlessWindowingData(100, 100), rd.ReplayOutputType.Texture) setup_marker = self.find_action("Setup") - self.controller.SetFrameEvent(setup_marker.nextAction.eventId, True) + self.set_event(setup_marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() @@ -24,10 +24,10 @@ class VK_Overlay_Test(rdtest.Overlay_Test): out.Display() # Select the next setup action - self.controller.SetFrameEvent(setup_marker.nextAction.eventId, True) + self.set_event(setup_marker.nextAction.eventId, True) # Select the real action for the first time - self.controller.SetFrameEvent(self.find_action("Normal Test").nextAction.eventId, True) + self.set_event(self.find_action("Normal Test").nextAction.eventId, True) self.check_pixel_value(tex.resourceId, 180, 150, [0.0, 0.0, 0.0, 0.0]) self.check_pixel_value(tex.resourceId, 50, 50, [0.0, 0.0, 0.0, 0.0]) @@ -44,7 +44,7 @@ class VK_Overlay_Test(rdtest.Overlay_Test): # Don't check any pixel values, but ensure all overlays at least work with rasterizer discard and no # viewport/scissor bound sub_marker = self.find_action("Discard Test") - self.controller.SetFrameEvent(sub_marker.nextAction.eventId, True) + self.set_event(sub_marker.nextAction.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Parameter_Zoo.py b/util/test/tests/Vulkan/VK_Parameter_Zoo.py index 17bc7d4a0..a8961911c 100644 --- a/util/test/tests/Vulkan/VK_Parameter_Zoo.py +++ b/util/test/tests/Vulkan/VK_Parameter_Zoo.py @@ -18,7 +18,7 @@ class VK_Parameter_Zoo(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -32,7 +32,7 @@ class VK_Parameter_Zoo(rdtest.TestCase): action = self.find_action("References") assert action is not None action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vkpipe = self.controller.GetVulkanPipelineState() @@ -118,7 +118,7 @@ class VK_Parameter_Zoo(rdtest.TestCase): action = self.find_action("PushTemplReferences") assert action is not None action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vkpipe = self.controller.GetVulkanPipelineState() @@ -172,7 +172,7 @@ class VK_Parameter_Zoo(rdtest.TestCase): action = action.nextAction assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -230,7 +230,7 @@ class VK_Parameter_Zoo(rdtest.TestCase): rdtest.log.print(f"Checking {action.customName}") - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) self.check_triangle(fore=[1.0, 0.0, 1.0, 1.0]) @@ -273,7 +273,7 @@ class VK_Parameter_Zoo(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() @@ -327,7 +327,7 @@ class VK_Parameter_Zoo(rdtest.TestCase): action = action.nextAction - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) self.check_triangle() diff --git a/util/test/tests/Vulkan/VK_Postponed.py b/util/test/tests/Vulkan/VK_Postponed.py index 020e06a45..1bed86d53 100644 --- a/util/test/tests/Vulkan/VK_Postponed.py +++ b/util/test/tests/Vulkan/VK_Postponed.py @@ -10,32 +10,32 @@ class VK_Postponed(rdtest.TestCase): tex = self.get_resource_by_name("offimg").resourceId action = self.find_action("Pre-Copy") - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # starts off cleared self.check_pixel_value(tex, 1, 1, [0.2, 0.2, 0.2, 1.0]) action = self.find_action("Post-Copy", action.eventId) - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Gets green from first postponed image copy self.check_pixel_value(tex, 1, 1, [0.2, 1.0, 0.2, 1.0]) action = self.find_action("Pre-Copy", action.eventId) - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) # Cleared to black before second copy self.check_pixel_value(tex, 1, 1, [0.0, 0.0, 0.0, 1.0]) action = self.find_action("Post-Copy", action.eventId) - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.check_pixel_value(tex, 1, 1, [0.2, 1.0, 0.2, 1.0]) rdtest.log.success("Image copies are all correct") action = self.find_action("Post-Draw", action.eventId) - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) pipe = self.controller.GetPipelineState() tex_details = self.get_texture(pipe.GetOutputTargets()[0].resource) diff --git a/util/test/tests/Vulkan/VK_Query_Pool.py b/util/test/tests/Vulkan/VK_Query_Pool.py index 48df3eaa1..f92f850c5 100644 --- a/util/test/tests/Vulkan/VK_Query_Pool.py +++ b/util/test/tests/Vulkan/VK_Query_Pool.py @@ -7,6 +7,6 @@ class VK_Query_Pool(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) diff --git a/util/test/tests/Vulkan/VK_Ray_Query.py b/util/test/tests/Vulkan/VK_Ray_Query.py index e5c9ac778..de35ee845 100644 --- a/util/test/tests/Vulkan/VK_Ray_Query.py +++ b/util/test/tests/Vulkan/VK_Ray_Query.py @@ -6,7 +6,7 @@ class VK_Ray_Query(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Read_Before_Overwrite.py b/util/test/tests/Vulkan/VK_Read_Before_Overwrite.py index 989cb11dd..a770818f4 100644 --- a/util/test/tests/Vulkan/VK_Read_Before_Overwrite.py +++ b/util/test/tests/Vulkan/VK_Read_Before_Overwrite.py @@ -7,9 +7,9 @@ class VK_Read_Before_Overwrite(rdtest.TestCase): def check_capture(self): # force a few replays to ensure we are definitely in a stable point - the first replay after load may have # slightly different contents (in the case of bugs) - self.controller.SetFrameEvent(self.find_action("checkpoint").eventId, True) - self.controller.SetFrameEvent(self.find_action("checkpoint").eventId, True) - self.controller.SetFrameEvent(self.find_action("checkpoint").eventId, True) + self.set_event(self.find_action("checkpoint").eventId, True) + self.set_event(self.find_action("checkpoint").eventId, True) + self.set_event(self.find_action("checkpoint").eventId, True) self.check_triangle(None, [0.2, 0.2, 0.2, 1.0], [1.0, 1.0, 1.0, 1.0], (0.0, 0.0, 200.0, 300.0)) self.check_triangle(None, [0.2, 0.2, 0.2, 1.0], [1.0, 1.0, 1.0, 1.0], (200.0, 0.0, 200.0, 300.0)) diff --git a/util/test/tests/Vulkan/VK_Resource_Lifetimes.py b/util/test/tests/Vulkan/VK_Resource_Lifetimes.py index 09a274ffa..6f57ddde1 100644 --- a/util/test/tests/Vulkan/VK_Resource_Lifetimes.py +++ b/util/test/tests/Vulkan/VK_Resource_Lifetimes.py @@ -8,7 +8,7 @@ class VK_Resource_Lifetimes(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tex = last_action.copyDestination diff --git a/util/test/tests/Vulkan/VK_Resource_Usage.py b/util/test/tests/Vulkan/VK_Resource_Usage.py index 61bbd6ea6..9f4144c1b 100644 --- a/util/test/tests/Vulkan/VK_Resource_Usage.py +++ b/util/test/tests/Vulkan/VK_Resource_Usage.py @@ -160,7 +160,7 @@ class VK_Resource_Usage(rdtest.TestCase): descBufferDrawEIDs.sort() action = self.find_action("Draw") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) swapImage = self.controller.GetPipelineState().GetOutputTargets()[0].resource with rdtest.log.auto_section("Checking Resource Usage"): @@ -339,7 +339,7 @@ class VK_Resource_Usage(rdtest.TestCase): eid = u.eventId if eid == 0: continue - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) if eid not in self.eids: raise rdtest.TestFailureException(f"'{res.name}' {res.resourceId} Missing EID:{eid}") diff --git a/util/test/tests/Vulkan/VK_Robustness2.py b/util/test/tests/Vulkan/VK_Robustness2.py index e1efd67f0..242c72c16 100644 --- a/util/test/tests/Vulkan/VK_Robustness2.py +++ b/util/test/tests/Vulkan/VK_Robustness2.py @@ -10,7 +10,7 @@ class VK_Robustness2(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.check_triangle() diff --git a/util/test/tests/Vulkan/VK_SPIRV_13_Shaders.py b/util/test/tests/Vulkan/VK_SPIRV_13_Shaders.py index 90810072d..ecbf12b1f 100644 --- a/util/test/tests/Vulkan/VK_SPIRV_13_Shaders.py +++ b/util/test/tests/Vulkan/VK_SPIRV_13_Shaders.py @@ -10,7 +10,7 @@ class VK_SPIRV_13_Shaders(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Sample_Locations.py b/util/test/tests/Vulkan/VK_Sample_Locations.py index 7b64be312..e17bbcadb 100644 --- a/util/test/tests/Vulkan/VK_Sample_Locations.py +++ b/util/test/tests/Vulkan/VK_Sample_Locations.py @@ -9,7 +9,7 @@ class VK_Sample_Locations(rdtest.TestCase): def check_capture(self): action = self.find_action("Degenerate") - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) pipe = self.controller.GetVulkanPipelineState() if pipe.multisample.rasterSamples != 4: @@ -33,7 +33,7 @@ class VK_Sample_Locations(rdtest.TestCase): raise rdtest.TestFailureException(f"In degenerate case, sample locations [1] and [2] DO match: {sampleLoc.customLocations[1]} vs {sampleLoc.customLocations[2]}") action = self.find_action("Rotated") - self.controller.SetFrameEvent(action.nextAction.eventId, True) + self.set_event(action.nextAction.eventId, True) pipe = self.controller.GetVulkanPipelineState() if pipe.multisample.rasterSamples != 4: @@ -85,7 +85,7 @@ class VK_Sample_Locations(rdtest.TestCase): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) # Due to the variability of rasterization between implementations or even drivers, # we don't want to check against a 'known good'. diff --git a/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py b/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py index 2cc3fa060..7a463dce0 100644 --- a/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py +++ b/util/test/tests/Vulkan/VK_Secondary_CmdBuf.py @@ -7,7 +7,7 @@ class VK_Secondary_CmdBuf(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) tex = self.get_texture(last_action.copyDestination) @@ -23,7 +23,7 @@ class VK_Secondary_CmdBuf(rdtest.TestCase): assert action is not None and action.nextAction is not None - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() @@ -47,7 +47,7 @@ class VK_Secondary_CmdBuf(rdtest.TestCase): assert action is not None and action.nextAction is not None - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py b/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py index 5dd2caede..d7e0258fc 100644 --- a/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py +++ b/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py @@ -20,7 +20,7 @@ class VK_Shader_Debug_Zoo(rdtest.TestCase): action = self.find_action(test_name) for child in range(len(action.children)): section = action.children[child] - self.controller.SetFrameEvent(section.eventId, False) + self.set_event(section.eventId, False) pipe = self.controller.GetPipelineState() if not pipe.GetShaderReflection(rd.ShaderStage.Pixel).debugInfo.debuggable: @@ -70,7 +70,7 @@ class VK_Shader_Debug_Zoo(rdtest.TestCase): rdtest.log.begin_section(test_name) action = self.find_action("ASM tests") - self.controller.SetFrameEvent(action.children[0].eventId, False) + self.set_event(action.children[0].eventId, False) pipe = self.controller.GetPipelineState() refl = pipe.GetShaderReflection(rd.ShaderStage.Pixel) assert refl is not None @@ -110,7 +110,7 @@ class VK_Shader_Debug_Zoo(rdtest.TestCase): a for a in comp_dim.children if a.flags & rd.ActionFlags.Dispatch] for test, action in enumerate(compute_tests): - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() csrefl = pipe.GetShaderReflection(rd.ShaderStage.Compute) if not csrefl.debugInfo.debuggable: diff --git a/util/test/tests/Vulkan/VK_Shader_Editing.py b/util/test/tests/Vulkan/VK_Shader_Editing.py index 56c25b4ed..b3be8e926 100644 --- a/util/test/tests/Vulkan/VK_Shader_Editing.py +++ b/util/test/tests/Vulkan/VK_Shader_Editing.py @@ -8,14 +8,14 @@ class VK_Shader_Editing(rdtest.TestCase): def check_capture(self): eid = self.find_action("Draw 1").nextAction.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() fsrefl1 = pipe.GetShaderReflection(rd.ShaderStage.Fragment) eid = self.find_action("Draw 2").nextAction.eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) pipe = self.controller.GetPipelineState() @@ -100,7 +100,7 @@ class VK_Shader_Editing(rdtest.TestCase): self.controller.ReplaceResource(fsrefl2.resourceId, FS2) # Refresh the replay if it didn't happen already - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Triangles have green and blue channel self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 1.0, 1.0]) @@ -110,7 +110,7 @@ class VK_Shader_Editing(rdtest.TestCase): # Now "edit" the VS but don't change it. We should still get the same values self.controller.ReplaceResource(vsrefl.resourceId, nochangeVS) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Triangles have green and blue channel self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 1.0, 1.0]) @@ -120,7 +120,7 @@ class VK_Shader_Editing(rdtest.TestCase): # Change the VS to one that has offset the triangles off-centre self.controller.ReplaceResource(vsrefl.resourceId, offsetVS) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Original sample positions are now the clear color self.check_pixel_value(tex, 0.25, 0.5, [0.2, 0.2, 0.2, 1.0]) @@ -134,7 +134,7 @@ class VK_Shader_Editing(rdtest.TestCase): # Now undo the first FS edit self.controller.RemoveReplacement(fsrefl1.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # Original sample positions are still the clear color self.check_pixel_value(tex, 0.25, 0.5, [0.2, 0.2, 0.2, 1.0]) @@ -148,7 +148,7 @@ class VK_Shader_Editing(rdtest.TestCase): # Now undo the first VS edit self.controller.RemoveReplacement(vsrefl.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # The right triangle is the edited colour, but they are back in the original positions self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 0.0, 1.0]) @@ -158,7 +158,7 @@ class VK_Shader_Editing(rdtest.TestCase): # finally undo the second FS edit self.controller.RemoveReplacement(fsrefl2.resourceId) - self.controller.SetFrameEvent(eid, True) + self.set_event(eid, True) # We should be back to where we started self.check_pixel_value(tex, 0.25, 0.5, [0.0, 1.0, 0.0, 1.0]) @@ -173,7 +173,7 @@ class VK_Shader_Editing(rdtest.TestCase): bufout = self.get_resource_by_name("bufout").resourceId - self.controller.SetFrameEvent(self.find_action("Pre-Dispatch").eventId, False) + self.set_event(self.find_action("Pre-Dispatch").eventId, False) pipe = self.controller.GetPipelineState() csrefl = pipe.GetShaderReflection(rd.ShaderStage.Compute) @@ -183,7 +183,7 @@ class VK_Shader_Editing(rdtest.TestCase): f'bufout data is incorrect before dispatch: {uints}') eid = self.find_action("Post-Dispatch").eventId - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) uints = struct.unpack_from('=4L', self.controller.GetBufferData(bufout, 0, 0), 0) if not rdtest.value_compare(uints, [777, 888, 999, 1110]): @@ -210,7 +210,7 @@ class VK_Shader_Editing(rdtest.TestCase): nochangeCS = newShader[0] self.controller.ReplaceResource(csrefl.resourceId, nochangeCS) - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) uints = struct.unpack_from('=4L', self.controller.GetBufferData(bufout, 0, 0), 0) if not rdtest.value_compare(uints, [777, 888, 999, 1110]): raise rdtest.TestFailureException( @@ -256,7 +256,7 @@ void main() CS1 = newShader[0] self.controller.ReplaceResource(csrefl.resourceId, CS1) - self.controller.SetFrameEvent(eid, False) + self.set_event(eid, False) uints = struct.unpack_from('=4L', self.controller.GetBufferData(bufout, 0, 0), 0) if not rdtest.value_compare(uints, [1110, 999, 888, 777]): raise rdtest.TestFailureException( diff --git a/util/test/tests/Vulkan/VK_Shader_ISA.py b/util/test/tests/Vulkan/VK_Shader_ISA.py index f6847ed8f..0e720938d 100644 --- a/util/test/tests/Vulkan/VK_Shader_ISA.py +++ b/util/test/tests/Vulkan/VK_Shader_ISA.py @@ -12,7 +12,7 @@ class VK_Shader_ISA(rdtest.TestCase): is_amd = 'AMD' in action.customName - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Shader_Printf.py b/util/test/tests/Vulkan/VK_Shader_Printf.py index c7b982619..9b8c07dd5 100644 --- a/util/test/tests/Vulkan/VK_Shader_Printf.py +++ b/util/test/tests/Vulkan/VK_Shader_Printf.py @@ -8,7 +8,7 @@ class VK_Shader_Printf(rdtest.TestCase): def check_capture(self): action = self.find_action('CmdDraw') - self.controller.SetFrameEvent(action.eventId, True) + self.set_event(action.eventId, True) self.check_triangle() @@ -41,7 +41,7 @@ class VK_Shader_Printf(rdtest.TestCase): action = self.find_action("CmdDispatch") - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) vkpipe = self.controller.GetVulkanPipelineState() diff --git a/util/test/tests/Vulkan/VK_Simple_Triangle.py b/util/test/tests/Vulkan/VK_Simple_Triangle.py index 09c5f2fdd..786421191 100644 --- a/util/test/tests/Vulkan/VK_Simple_Triangle.py +++ b/util/test/tests/Vulkan/VK_Simple_Triangle.py @@ -8,7 +8,7 @@ class VK_Simple_Triangle(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) @@ -18,7 +18,7 @@ class VK_Simple_Triangle(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) postvs_data = self.get_postvs(action, rd.MeshDataStage.VSOut, 0, action.numIndices) diff --git a/util/test/tests/Vulkan/VK_Spec_Constants.py b/util/test/tests/Vulkan/VK_Spec_Constants.py index 80c8fb023..d5fc56f31 100644 --- a/util/test/tests/Vulkan/VK_Spec_Constants.py +++ b/util/test/tests/Vulkan/VK_Spec_Constants.py @@ -14,7 +14,7 @@ class VK_Spec_Constants(rdtest.TestCase): for num_colors in range(4): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() vkpipe = self.controller.GetVulkanPipelineState() diff --git a/util/test/tests/Vulkan/VK_Synchronization_2.py b/util/test/tests/Vulkan/VK_Synchronization_2.py index 1db2c9a44..9d3bea7ec 100644 --- a/util/test/tests/Vulkan/VK_Synchronization_2.py +++ b/util/test/tests/Vulkan/VK_Synchronization_2.py @@ -14,7 +14,7 @@ class VK_Synchronization_2(rdtest.TestCase): return opts def check_capture(self): - self.controller.SetFrameEvent(0, False) + self.set_event(0, False) pipe = self.controller.GetVulkanPipelineState() @@ -35,7 +35,7 @@ class VK_Synchronization_2(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetVulkanPipelineState() @@ -61,7 +61,7 @@ class VK_Synchronization_2(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) # Check that the backbuffer didn't get discarded self.check_triangle(out=action.outputs[0]) diff --git a/util/test/tests/Vulkan/VK_Texture_Zoo.py b/util/test/tests/Vulkan/VK_Texture_Zoo.py index 670b48a08..88e25a29e 100644 --- a/util/test/tests/Vulkan/VK_Texture_Zoo.py +++ b/util/test/tests/Vulkan/VK_Texture_Zoo.py @@ -13,5 +13,5 @@ class VK_Texture_Zoo(rdtest.TestCase): assert self.controller is not None # This takes ownership of the controller and shuts it down when it's finished self.zoo_helper.worker_thread = self.worker_thread - self.zoo_helper.check_capture(self.capture_filename, self.controller) + self.zoo_helper.check_capture(self.capture_filename, self) self.controller = None diff --git a/util/test/tests/Vulkan/VK_VRS.py b/util/test/tests/Vulkan/VK_VRS.py index 666ab70c2..157fe7698 100644 --- a/util/test/tests/Vulkan/VK_VRS.py +++ b/util/test/tests/Vulkan/VK_VRS.py @@ -49,7 +49,7 @@ class VK_VRS(rdtest.TestCase): action = self.find_action("Default", pass_action.eventId) assert action is not None - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) num_checks = 0 @@ -57,39 +57,39 @@ class VK_VRS(rdtest.TestCase): num_checks += 1 action = self.find_action("Base", pass_action.eventId) - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 action = self.find_action("Vertex", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("1x1", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 rdtest.log.success("Shading rates were as expected in per-vertex case") action = self.find_action("Image", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "1x1"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 rdtest.log.success("Shading rates were as expected in image-based case") action = self.find_action("Base + Vertex", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 action = self.find_action("Base + Image", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 action = self.find_action("Vertex + Image", pass_action.eventId) if action is not None: - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) assert self.get_shading_rates() == ("2x2", "2x2"), f"{action.customName} shading rates unexpected: {self.get_shading_rates()}" num_checks += 1 diff --git a/util/test/tests/Vulkan/VK_VS_Max_Desc_Set.py b/util/test/tests/Vulkan/VK_VS_Max_Desc_Set.py index 20b263f6c..a88ec47d7 100644 --- a/util/test/tests/Vulkan/VK_VS_Max_Desc_Set.py +++ b/util/test/tests/Vulkan/VK_VS_Max_Desc_Set.py @@ -11,7 +11,7 @@ class VK_VS_Max_Desc_Set(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) pipe = self.controller.GetPipelineState() diff --git a/util/test/tests/Vulkan/VK_Validation_Use.py b/util/test/tests/Vulkan/VK_Validation_Use.py index af1f8ff25..eb27aa27f 100644 --- a/util/test/tests/Vulkan/VK_Validation_Use.py +++ b/util/test/tests/Vulkan/VK_Validation_Use.py @@ -7,6 +7,6 @@ class VK_Validation_Use(rdtest.TestCase): def check_capture(self): last_action = self.get_last_action() - self.controller.SetFrameEvent(last_action.eventId, True) + self.set_event(last_action.eventId, True) self.check_triangle(out=last_action.copyDestination) diff --git a/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py b/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py index 8471098e0..75ee36514 100644 --- a/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py +++ b/util/test/tests/Vulkan/VK_Vertex_Attr_Zoo.py @@ -11,7 +11,7 @@ class VK_Vertex_Attr_Zoo(rdtest.TestCase): assert action is not None - self.controller.SetFrameEvent(action.eventId, False) + self.set_event(action.eventId, False) ref: rdtest.MeshReference = { 0: { @@ -131,7 +131,7 @@ class VK_Vertex_Attr_Zoo(rdtest.TestCase): rdtest.log.success("Triangle picked value is as expected") # Step to the next action with awkward struct/array outputs - self.controller.SetFrameEvent(action.nextAction.eventId, False) + self.set_event(action.nextAction.eventId, False) ref: rdtest.MeshReference = { 0: {