diff options
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci/build-renderdoc.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/tracie/renderdoc_dump_images.py | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f45e6d42d43..55c39cce466 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ x86_build: - .debian@container-ifnot-exists - .container variables: - DEBIAN_TAG: &x86_build "2020-03-11" + DEBIAN_TAG: &x86_build "2020-03-13" .use-x86_build: variables: @@ -133,7 +133,7 @@ x86_build: x86_test-gl: extends: x86_build variables: - DEBIAN_TAG: &x86_test-gl "2020-03-11" + DEBIAN_TAG: &x86_test-gl "2020-03-13" # Debian 10 based x86 test image for VK x86_test-vk: @@ -161,7 +161,7 @@ arm_build: - .debian@container-ifnot-exists@arm64v8 - .container variables: - DEBIAN_TAG: &arm_build "2020-03-09" + DEBIAN_TAG: &arm_build "2020-03-13" .use-arm_build: variables: diff --git a/.gitlab-ci/build-renderdoc.sh b/.gitlab-ci/build-renderdoc.sh index 31c8c014b8a..640386b4422 100644 --- a/.gitlab-ci/build-renderdoc.sh +++ b/.gitlab-ci/build-renderdoc.sh @@ -2,7 +2,7 @@ set -ex -RENDERDOC_VERSION=6653316a62f6168b3e45040358cb77612dcffcb8 +RENDERDOC_VERSION=da02e88201dc3b64316fc33ce6ff69cc729689aa git clone https://github.com/baldurk/renderdoc.git --single-branch --no-checkout /renderdoc pushd /renderdoc diff --git a/.gitlab-ci/tracie/renderdoc_dump_images.py b/.gitlab-ci/tracie/renderdoc_dump_images.py index f1252c11f25..689ee2d0a87 100755 --- a/.gitlab-ci/tracie/renderdoc_dump_images.py +++ b/.gitlab-ci/tracie/renderdoc_dump_images.py @@ -83,8 +83,8 @@ def loadCapture(filename): return (cap, controller) def renderdoc_dump_images(filename, eventIds, outputDir): - rd.InitGlobalEnv(rd.GlobalEnvironment(), []) - cap,controller = loadCapture(filename); + rd.InitialiseReplay(rd.GlobalEnvironment(), []) + cap, controller = loadCapture(filename); tracefile = Path(filename).name @@ -97,6 +97,8 @@ def renderdoc_dump_images(filename, eventIds, outputDir): controller.Shutdown() cap.Shutdown() + rd.ShutdownReplay() + if __name__ == "__main__": if len(sys.argv) < 3: raise RuntimeError("Usage: renderdoc_dump_images.py <trace> <outputdir> [<draw-id>...]") |