From 6d482a7cf97abe81737147d2c1a4728aa861e8d9 Mon Sep 17 00:00:00 2001 From: Nick Renieris Date: Thu, 8 Oct 2026 02:06:33 +0300 Subject: [PATCH 1/2] Build against RenderDoc v1.46 on Windows Opens captures made with RenderDoc 1.46 (GL serialise version 36). RenderDoc 1.46 reads the Python prefix from VSPythonOverridePath, so the pyd was built against bundled Python 3.6. --- src/rdc/_build_renderdoc.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rdc/_build_renderdoc.py b/src/rdc/_build_renderdoc.py index 9d8c36c..9b6f4bb 100644 --- a/src/rdc/_build_renderdoc.py +++ b/src/rdc/_build_renderdoc.py @@ -30,7 +30,7 @@ from pathlib import Path from urllib.request import urlretrieve -RDOC_TAG = "v1.41" +RDOC_TAG = "v1.46" RDOC_REPO = "https://github.com/baldurk/renderdoc.git" SWIG_URL = "https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip" SWIG_SHA256 = "9d7e5013ada6c42ec95ab167a34db52c1cc8c09b89c8e9373631b1f10596c648" @@ -258,7 +258,8 @@ def _run_msbuild(build_dir: Path, python_prefix: Path, jobs: int | None = None) msbuild = _find_msbuild() n = jobs or os.cpu_count() or 4 env = dict(os.environ) - env["RENDERDOC_PYTHON_PREFIX64"] = str(python_prefix) + env["RENDERDOC_PYTHON_PREFIX64"] = str(python_prefix) # RenderDoc <= v1.41 + env["VSPythonOverridePath"] = str(python_prefix) # RenderDoc >= v1.46 env["CL"] = (env.get("CL", "") + " /wd4996").strip() cmd = [ msbuild, From e57392ce3188c11a5f5f94420397dd8a092004fa Mon Sep 17 00:00:00 2001 From: Nick Renieris Date: Thu, 8 Oct 2026 02:53:32 +0300 Subject: [PATCH 2/2] Pin RenderDoc v1.46 in the other build files Keeps the scripts, Dockerfile and PKGBUILDs on the same tag as _build_renderdoc.py. --- aur/PKGBUILD | 2 +- aur/stable/PKGBUILD | 2 +- docker/Dockerfile | 2 +- scripts/build-renderdoc.sh | 4 ++-- scripts/setup-renderdoc.sh | 4 ++-- tests/unit/test_build_renderdoc.py | 2 +- tests/unit/test_tooling_files.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aur/PKGBUILD b/aur/PKGBUILD index 42c516b..08249b3 100644 --- a/aur/PKGBUILD +++ b/aur/PKGBUILD @@ -33,7 +33,7 @@ provides=('rdc-cli') conflicts=('rdc-cli') source=( "git+https://github.com/BANANASJIM/rdc-cli.git" - "git+https://github.com/baldurk/renderdoc.git#tag=v1.41" + "git+https://github.com/baldurk/renderdoc.git#tag=v1.46" "renderdoc-swig::https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip" ) sha256sums=('SKIP' diff --git a/aur/stable/PKGBUILD b/aur/stable/PKGBUILD index 349be06..cd732a7 100644 --- a/aur/stable/PKGBUILD +++ b/aur/stable/PKGBUILD @@ -33,7 +33,7 @@ provides=('rdc-cli') conflicts=('rdc-cli-git') source=( "rdc-cli-${pkgver}.tar.gz::https://github.com/BANANASJIM/rdc-cli/archive/refs/tags/v${pkgver}.tar.gz" - "git+https://github.com/baldurk/renderdoc.git#tag=v1.41" + "git+https://github.com/baldurk/renderdoc.git#tag=v1.46" "renderdoc-swig::https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip" ) sha256sums=('PLACEHOLDER' diff --git a/docker/Dockerfile b/docker/Dockerfile index 434fd83..3a3d14d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* # Build renderdoc from source with Python module enabled -ARG RENDERDOC_VERSION=v1.41 +ARG RENDERDOC_VERSION=v1.46 RUN git clone --depth 1 --branch ${RENDERDOC_VERSION} \ https://github.com/baldurk/renderdoc.git /renderdoc \ && cd /renderdoc \ diff --git a/scripts/build-renderdoc.sh b/scripts/build-renderdoc.sh index 0edbe5d..3727cfb 100755 --- a/scripts/build-renderdoc.sh +++ b/scripts/build-renderdoc.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash # DEPRECATED: use scripts/build_renderdoc.py instead. # Kept for curl-pipe users on systems without Python 3.10+. -# Build renderdoc v1.41 Python module from source. +# Build renderdoc v1.46 Python module from source. # Usage: bash <(curl -fsSL https://raw.githubusercontent.com/BANANASJIM/rdc-cli/master/scripts/build-renderdoc.sh) [INSTALL_DIR] # Output: INSTALL_DIR/renderdoc.so + librenderdoc.so (default: ~/.local/renderdoc/) set -euo pipefail -RDOC_TAG="v1.41" +RDOC_TAG="v1.46" SWIG_URL="https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip" SWIG_SHA256="9d7e5013ada6c42ec95ab167a34db52c1cc8c09b89c8e9373631b1f10596c648" OUT_DIR="${1:-${HOME}/.local/renderdoc}" diff --git a/scripts/setup-renderdoc.sh b/scripts/setup-renderdoc.sh index 92e16d5..df0b1da 100755 --- a/scripts/setup-renderdoc.sh +++ b/scripts/setup-renderdoc.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # DEPRECATED: use scripts/build_renderdoc.py instead. # Kept for curl-pipe users on systems without Python 3.10+. -# Build renderdoc v1.41 Python module for the pixi dev environment. +# Build renderdoc v1.46 Python module for the pixi dev environment. # Usage: pixi run setup-renderdoc # Output: .local/renderdoc/renderdoc.so + librenderdoc.so # Only needs to run once (or after Python version change). set -euo pipefail -RDOC_TAG="v1.41" +RDOC_TAG="v1.46" SWIG_URL="https://github.com/baldurk/swig/archive/renderdoc-modified-7.zip" BUILD_DIR=".local/renderdoc-build" OUT_DIR=".local/renderdoc" diff --git a/tests/unit/test_build_renderdoc.py b/tests/unit/test_build_renderdoc.py index fa3b61d..2bedc77 100644 --- a/tests/unit/test_build_renderdoc.py +++ b/tests/unit/test_build_renderdoc.py @@ -149,7 +149,7 @@ def test_clone_renderdoc_fresh(tmp_path: Path) -> None: assert "--depth" in args assert "1" in args assert "--branch" in args - assert "v1.41" in args + assert "v1.46" in args def test_clone_renderdoc_idempotent(tmp_path: Path) -> None: diff --git a/tests/unit/test_tooling_files.py b/tests/unit/test_tooling_files.py index aaf8365..5c753e6 100644 --- a/tests/unit/test_tooling_files.py +++ b/tests/unit/test_tooling_files.py @@ -37,7 +37,7 @@ def test_build_renderdoc_script_syntax() -> None: def test_build_renderdoc_script_constants() -> None: text = Path("scripts/build-renderdoc.sh").read_text() assert "set -euo pipefail" in text - assert "v1.41" in text + assert "v1.46" in text assert "9d7e5013" in text assert "RENDERDOC_PYTHON_PATH" in text assert "DRENDERDOC_SWIG_PACKAGE" in text