diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-03-11 08:54:22 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-03-17 07:12:36 +0100 |
| commit | 2ca662fb61269e3e3d36f8aab5939bc9dce14b4a (patch) | |
| tree | 09c0568dc1bb9a83fa60c2904906f8f552b129ca /.gitlab-ci | |
| parent | ac1dbd5ef81fe9bd389e38f22da32d940c1d9e02 (diff) | |
gitlab-ci: Update renderdoc
Get closer to upstream to avoid accumulating changes.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4000>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/build-renderdoc.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/tracie/renderdoc_dump_images.py | 6 |
2 files changed, 5 insertions, 3 deletions
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>...]") |