From 4dc4ccf838e2126aa2532c98a474c7c9228e375e Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sun, 19 Mar 2023 09:28:08 +0100 Subject: [PATCH] framework/replay: update renderdoc against v1.20 See: https://github.com/baldurk/renderdoc/releases/tag/v1.20 Acked-by: Guilherme Gallo Signed-off-by: David Heidelberg Part-of: --- framework/replay/backends/renderdoc/renderdoc_dump_images.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/framework/replay/backends/renderdoc/renderdoc_dump_images.py b/framework/replay/backends/renderdoc/renderdoc_dump_images.py index b50a7b917..feb96c499 100755 --- a/framework/replay/backends/renderdoc/renderdoc_dump_images.py +++ b/framework/replay/backends/renderdoc/renderdoc_dump_images.py @@ -44,6 +44,11 @@ RENDERDOC_DEBUG_FILE = TMP_DIR + "/renderdoc.log" os.environ['RENDERDOC_DEBUG_LOG_FILE'] = RENDERDOC_DEBUG_FILE import renderdoc as rd # noqa: E402 +try: + from renderdoc import ResultCode +except ImportError: + from renderdoc import ReplayStatus as ResultCode + def find_draw_with_event_id(controller, event_id): for d in controller.GetDrawcalls(): @@ -92,14 +97,14 @@ def load_capture(filename): status = cap.OpenFile(filename, '', None) - if status != rd.ReplayStatus.Succeeded: + if status != ResultCode.Succeeded: raise RuntimeError("Couldn't open file: " + str(status)) if not cap.LocalReplaySupport(): raise RuntimeError("Capture cannot be replayed") status, controller = cap.OpenCapture(rd.ReplayOptions(), None) - if status != rd.ReplayStatus.Succeeded: + if status != ResultCode.Succeeded: if os.path.exists(RENDERDOC_DEBUG_FILE): print(open(RENDERDOC_DEBUG_FILE, "r").read()) raise RuntimeError("Couldn't initialise replay: " + str(status)) -- 2.11.4.GIT