rdc-cli 0.5.6__tar.gz → 0.6.1__tar.gz

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/.gitignore

@@ -18,4 +18,6 @@ tests/fixtures/vulkan_samples
 .claude/*
 !.claude/skills/
 _site/
+docs-astro/.astro/
 docs-astro/dist/
+docs-astro/node_modules/

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdc-cli
-Version: 0.5.6
+Version: 0.6.1
 Summary: CLI for RenderDoc .rdc captures
 Author: Jim
 License-Expression: MIT
@@ -142,7 +142,9 @@ rdc search "shadowMap"                # grep across all shaders in the frame
 ```bash
 rdc texture 5 -o albedo.png           # export a texture
 rdc rt 142 -o render.png              # export render target
+rdc rt 142 --depth -o depth.png       # export raw depth attachment
 rdc buffer 88 -o verts.bin            # export raw buffer
+rdc cbuffer 142 --stage ps --binding 0  # decode a constant buffer to JSON
 rdc snapshot 142 -o ./snap/           # pipeline + shaders + render targets
 rdc draws --json | jq '.[] | select(.triangles > 10000)'  # filter with jq
 ```
@@ -177,6 +179,9 @@ rdc-cli supports three deployment modes:
 | **Split** (`--listen`/`--connect`) | server | server-local GPU | **no** |
 
 ```bash
+# Multi-GPU host: force the replay GPU (0-based index, name, or device ID)
+rdc open frame.rdc --gpu 1
+
 # Proxy: local daemon, remote GPU (needs renderdoccmd on remote)
 rdc open frame.rdc --proxy gpu-server:39920
 
@@ -238,12 +243,12 @@ Run `rdc --help` for the full list, or `rdc <command> --help` for details.  See
 | Debug | `debug pixel`, `debug vertex`, `debug thread`, `pixel`, `pick-pixel`, `tex-stats` |
 | Shader edit | `shader-build`, `shader-replace`, `shader-restore`, `shader-restore-all`, `shader-encodings` |
 | Resources | `resources`, `resource`, `passes`, `pass`, `usage`, `unused-targets` |
-| Export | `texture`, `rt`, `buffer`, `mesh`, `snapshot` |
+| Export | `texture`, `rt`, `buffer`, `cbuffer`, `mesh`, `snapshot` |
 | Search | `search`, `counters` |
 | Assertions | `assert-pixel`, `assert-state`, `assert-image`, `assert-count`, `assert-clean` |
 | Diff | `diff` (with `--draws`, `--stats`, `--framebuffer`, `--pipeline`, etc.) |
 | VFS | `ls`, `cat`, `tree` |
-| Remote | `remote connect`, `remote list`, `remote capture` |
+| Remote | `remote connect`, `remote list`, `remote capture`, `remote setup`, `remote status`, `remote disconnect` |
 | Android | `android setup`, `android stop`, `android capture` |
 | Target control | `attach`, `capture-trigger`, `capture-list`, `capture-copy` |
 | Capture file | `sections`, `section`, `callstacks`, `gpus`, `thumbnail` |

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/README.md

@@ -115,7 +115,9 @@ rdc search "shadowMap"                # grep across all shaders in the frame
 ```bash
 rdc texture 5 -o albedo.png           # export a texture
 rdc rt 142 -o render.png              # export render target
+rdc rt 142 --depth -o depth.png       # export raw depth attachment
 rdc buffer 88 -o verts.bin            # export raw buffer
+rdc cbuffer 142 --stage ps --binding 0  # decode a constant buffer to JSON
 rdc snapshot 142 -o ./snap/           # pipeline + shaders + render targets
 rdc draws --json | jq '.[] | select(.triangles > 10000)'  # filter with jq
 ```
@@ -150,6 +152,9 @@ rdc-cli supports three deployment modes:
 | **Split** (`--listen`/`--connect`) | server | server-local GPU | **no** |
 
 ```bash
+# Multi-GPU host: force the replay GPU (0-based index, name, or device ID)
+rdc open frame.rdc --gpu 1
+
 # Proxy: local daemon, remote GPU (needs renderdoccmd on remote)
 rdc open frame.rdc --proxy gpu-server:39920
 
@@ -211,12 +216,12 @@ Run `rdc --help` for the full list, or `rdc <command> --help` for details.  See
 | Debug | `debug pixel`, `debug vertex`, `debug thread`, `pixel`, `pick-pixel`, `tex-stats` |
 | Shader edit | `shader-build`, `shader-replace`, `shader-restore`, `shader-restore-all`, `shader-encodings` |
 | Resources | `resources`, `resource`, `passes`, `pass`, `usage`, `unused-targets` |
-| Export | `texture`, `rt`, `buffer`, `mesh`, `snapshot` |
+| Export | `texture`, `rt`, `buffer`, `cbuffer`, `mesh`, `snapshot` |
 | Search | `search`, `counters` |
 | Assertions | `assert-pixel`, `assert-state`, `assert-image`, `assert-count`, `assert-clean` |
 | Diff | `diff` (with `--draws`, `--stats`, `--framebuffer`, `--pipeline`, etc.) |
 | VFS | `ls`, `cat`, `tree` |
-| Remote | `remote connect`, `remote list`, `remote capture` |
+| Remote | `remote connect`, `remote list`, `remote capture`, `remote setup`, `remote status`, `remote disconnect` |
 | Android | `android setup`, `android stop`, `android capture` |
 | Target control | `attach`, `capture-trigger`, `capture-list`, `capture-copy` |
 | Capture file | `sections`, `section`, `callstacks`, `gpus`, `thumbnail` |

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/docs-astro/src/data/commands.json

@@ -58,7 +58,7 @@
           "name": "stats",
           "id": "stats",
           "help": "Show per-pass breakdown, top draws, largest resources.",
-          "usage": "rdc stats [--json] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc stats [--no-header] [--json] [--jsonl] [-q]"
         },
         {
           "name": "events",
@@ -88,13 +88,13 @@
           "name": "log",
           "id": "log",
           "help": "Show debug/validation messages from the capture.",
-          "usage": "rdc log [--level CHOICE] [--eid INTEGER] [--json] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc log [--level CHOICE] [--eid INTEGER] [--no-header] [--json] [--jsonl] [-q]"
         },
         {
           "name": "counters",
           "id": "counters",
           "help": "Query GPU performance counters.",
-          "usage": "rdc counters [--list] [--eid INTEGER] [--name TEXT] [--json] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc counters [--list] [--eid INTEGER] [--name TEXT] [--no-header] [--json] [--jsonl] [-q]"
         }
       ]
     },
@@ -113,7 +113,13 @@
           "name": "bindings",
           "id": "bindings",
           "help": "Show bound resources per shader stage.",
-          "usage": "rdc bindings [EID] [--binding INTEGER] [--set INTEGER] [--json] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc bindings [EID] [--binding INTEGER] [--set INTEGER] [--no-header] [--json] [--jsonl] [-q]"
+        },
+        {
+          "name": "descriptors",
+          "id": "descriptors",
+          "help": "Show the descriptors a draw actually used, resolved to resources.",
+          "usage": "rdc descriptors [EID] [--stage CHOICE] [--type TEXT] [--binding TEXT] [--no-header] [--json] [--jsonl] [-q]"
         }
       ]
     },
@@ -126,7 +132,7 @@
           "name": "resources",
           "id": "resources",
           "help": "List all resources.",
-          "usage": "rdc resources [--json] [--type TEXT] [--name TEXT] [--sort CHOICE] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc resources [--type TEXT] [--name TEXT] [--sort CHOICE] [--no-header] [--json] [--jsonl] [-q]"
         },
         {
           "name": "resource",
@@ -138,7 +144,7 @@
           "name": "usage",
           "id": "usage",
           "help": "Show resource usage (which events read/write a resource).",
-          "usage": "rdc usage [RESOURCE-ID] [--all] [--type TEXT] [--usage TEXT] [--json] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc usage [RESOURCE-ID] [--all] [--type TEXT] [--usage TEXT] [--no-header] [--json] [--jsonl] [-q]"
         },
         {
           "name": "shader",
@@ -150,7 +156,7 @@
           "name": "shaders",
           "id": "shaders",
           "help": "List unique shaders in capture.",
-          "usage": "rdc shaders [--stage CHOICE] [--sort CHOICE] [--json] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc shaders [--stage CHOICE] [--sort CHOICE] [--no-header] [--json] [--jsonl] [-q]"
         },
         {
           "name": "shader-map",
@@ -168,7 +174,7 @@
           "name": "passes",
           "id": "passes",
           "help": "List render passes.",
-          "usage": "rdc passes [--json] [--deps] [--dot] [--graph] [--table] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc passes [--deps] [--dot] [--graph] [--table] [--no-header] [--json] [--jsonl] [-q]"
         },
         {
           "name": "pass",
@@ -211,13 +217,13 @@
           "name": "rt",
           "id": "rt",
           "help": "Export render target as PNG.",
-          "usage": "rdc rt [EID] [-o PATH] [--target INTEGER] [--raw] [--overlay CHOICE] [--width INTEGER] [--height INTEGER]"
+          "usage": "rdc rt [EID] [-o PATH] [--target INTEGER] [--depth] [--raw] [--overlay CHOICE] [--width INTEGER] [--height INTEGER]"
         },
         {
           "name": "mesh",
           "id": "mesh",
           "help": "Export post-transform mesh as OBJ.",
-          "usage": "rdc mesh [EID] [--stage CHOICE] [-o PATH] [--json] [--no-header]"
+          "usage": "rdc mesh [EID] [--stage CHOICE] [-o PATH] [--json] [--no-header] [--position-attribute TEXT] [--position-index INTEGER] [--position-slot INTEGER] [--position-offset INTEGER]"
         },
         {
           "name": "snapshot",
@@ -236,7 +242,7 @@
           "name": "pixel",
           "id": "pixel",
           "help": "Query pixel history at (X, Y) for the current or specified event.",
-          "usage": "rdc pixel <X> <Y> [EID] [--target INTEGER] [--sample INTEGER] [--json] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc pixel <X> <Y> [EID] [--target INTEGER] [--sample INTEGER] [--no-header] [--json] [--jsonl] [-q]"
         },
         {
           "name": "pick-pixel",

rdc_cli-0.6.1/docs-astro/src/data/replay.json

@@ -0,0 +1,116 @@
+[
+  [
+    {
+      "cmd": "rdc open hello_triangle.rdc",
+      "output": "opened: hello_triangle.rdc"
+    },
+    {
+      "cmd": "rdc info",
+      "output": "Capture:        hello_triangle.rdc\nAPI:            Vulkan\nEvents:         6\nDraw Calls:     1 (0 indexed, 1 non-indexed, 0 dispatches)\nClears:         0\nCopies:         0"
+    },
+    {
+      "cmd": "rdc draws",
+      "output": "EID\tTYPE\tTRIANGLES\tINSTANCES\tPASS\tMARKER\n11\tDraw\t12\t1\tColour Pass #1 (1 Target + Depth)\t-"
+    },
+    {
+      "cmd": "rdc pipeline 11",
+      "output": "EID\tAPI\tTOPOLOGY\tGFX_PIPE\tCOMP_PIPE\n11\tVulkan\tTriangleList\t114\t0"
+    },
+    {
+      "cmd": "rdc search \"main\"",
+      "output": "shader:111[vs]:12:EntryPoint(Vertex, main, \"main\", {\nshader:111[vs]:43:void main() {\nshader:112[ps]:12:EntryPoint(Fragment, main, \"main\", {\nshader:112[ps]:18:ExecutionMode(main, OriginUpperLeft);\nshader:112[ps]:32:void main() {"
+    },
+    {
+      "cmd": "rdc close",
+      "output": "session closed"
+    }
+  ],
+  [
+    {
+      "cmd": "rdc open hello_triangle.rdc",
+      "output": "opened: hello_triangle.rdc"
+    },
+    {
+      "cmd": "rdc tree / --depth 1",
+      "output": "//\n|-- capabilities\n|-- info\n|-- stats\n|-- log\n|-- events/\n|-- draws/\n|-- passes/\n|-- resources/\n|-- textures/\n|-- buffers/\n|-- shaders/\n|-- counters/\n\\-- current@"
+    },
+    {
+      "cmd": "rdc ls /draws/11",
+      "output": "pipeline\nshader\nbindings\ntargets\npostvs\ncbuffer\nvbuffer\nibuffer\ndescriptors\npixel"
+    },
+    {
+      "cmd": "rdc cat /draws/11/pipeline/topology",
+      "output": "eid:      11\ntopology: TriangleList"
+    },
+    {
+      "cmd": "rdc resources -q | wc -l",
+      "output": "46"
+    },
+    {
+      "cmd": "rdc draws --json | jq \".[0].triangles\"",
+      "output": "12"
+    },
+    {
+      "cmd": "rdc close",
+      "output": "session closed"
+    }
+  ],
+  [
+    {
+      "cmd": "rdc open hello_triangle.rdc",
+      "output": "opened: hello_triangle.rdc"
+    },
+    {
+      "cmd": "rdc pick-pixel 300 300 11",
+      "output": "r=0.3373  g=0.3373  b=0.3373  a=0.5216"
+    },
+    {
+      "cmd": "rdc pixel 300 300 11",
+      "output": "EID\tFRAG\tDEPTH\tPASSED\tFLAGS\n6\t0\t-\tyes\t-\n11\t0\t0.9581\tyes\t-"
+    },
+    {
+      "cmd": "rdc debug pixel 11 300 300",
+      "output": "stage:   ps\neid:     11\nsteps:   80\ninputs:  _99 = [-107374176.0 -107374176.0 -107374176.0 -107374176.0]\noutputs:  = [0.0]"
+    },
+    {
+      "cmd": "rdc debug pixel 11 300 300 --trace",
+      "output": "STEP\tINSTR\tFILE\tLINE\tVAR\tTYPE\tVALUE\n0\t78\t-\t0\t_99\tfloat\t-107374176.0 -107374176.0 -107374176.0 -107374176.0\n1\t79\t-\t0\t_79\tfloat\t-0.015102430246770382 -0.3927634656429291 4.36358118057251\n2\t80\t-\t0\t_80\tfloat\t0.01510667521506548 -8.669495582580566e-05 0.0010061264038085938\n3\t81\t-\t0\t\tfloat\t0.0\n3\t81\t-\t0\t_76\tfloat\t0.01510667521506548 -8.669495582580566e-05 0.0010061264038085938\n4\t82\t-\t0\t\tfloat\t0.0\n4\t82\t-\t0\t_82\tfloat\t-0.015102430246770382 -0.3927634656429291 4.36358118057251\n... (138 more)"
+    },
+    {
+      "cmd": "rdc close",
+      "output": "session closed"
+    }
+  ],
+  [
+    {
+      "cmd": "rdc open hello_triangle.rdc",
+      "output": "opened: hello_triangle.rdc"
+    },
+    {
+      "cmd": "rdc draws --json",
+      "output": "[\n  {\n    \"eid\": 11,\n    \"type\": \"Draw\",\n    \"triangles\": 12,\n    \"instances\": 1,\n    \"pass\": \"Colour Pass #1 (1 Target + Depth)\",\n    \"marker\": \"-\"\n  }\n]"
+    },
+    {
+      "cmd": "rdc assert-count draws --expect 1 --op eq",
+      "output": "pass: draws = 1 (expected eq 1)"
+    },
+    {
+      "cmd": "rdc assert-count events --expect 5 --op ge",
+      "output": "pass: events = 6 (expected ge 5)"
+    },
+    {
+      "cmd": "rdc close",
+      "output": "session closed"
+    }
+  ],
+  [
+    {
+      "cmd": "rdc diff before.rdc after.rdc --draws",
+      "output": "STATUS\tEID_A\tEID_B\tMARKER\tTYPE\tTRI_A\tTRI_B\tINST_A\tINST_B\tCONFIDENCE\n=\t11\t11\t-\tDraw\t12\t12\t1\t1\tmedium"
+    },
+    {
+      "cmd": "rdc diff before.rdc after.rdc --stats",
+      "output": "STATUS\tPASS\tDRAWS_A\tDRAWS_B\tDRAWS_DELTA\tTRI_A\tTRI_B\tTRI_DELTA\tDISP_A\tDISP_B\tDISP_DELTA\n=\tvkCmdBeginRenderPass(C=Clear, D=Clear)\t1\t1\t0\t12\t12\t0\t0\t0\t0"
+    }
+  ]
+]

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/docs-astro/src/pages/docs/examples.astro

@@ -52,7 +52,9 @@ rdc draws --no-header
 
 {"# Quiet — IDs only, great for xargs loops"}
 rdc draws -q
-{"# → 11\n14\n19"}
+{"# → 11"}
+{"#   14"}
+{"#   19"}
 
 {"# Combine: export all draw render targets"}
 for eid in $(rdc draws -q); do
@@ -171,7 +173,9 @@ rdc snapshot 142 -o ./snapshot/
 {"# Individual exports"}
 rdc texture 5 -o albedo.png             {"# specific texture"}
 rdc buffer 3 -o vertex_data.bin         {"# raw buffer data"}
-rdc mesh 142 -o geometry.obj            {"# post-transform mesh"}</code></pre>
+rdc mesh 142 -o geometry.obj            {"# post-transform mesh"}
+rdc rt 142 --depth -o depth.png         {"# raw depth attachment"}
+rdc cbuffer 142 --stage ps --binding 0  {"# decode constant buffer to JSON"}</code></pre>
 
   <h2 id="shell-pipelines">Shell Pipeline Power</h2>
 
@@ -283,12 +287,6 @@ rdc passes --json | jq '.[] | select(.load_ops[]? == "Clear" and .store_ops[]? =
   <pre><code>{"# Per-pass reads/writes/load/store table"}
 rdc passes --deps --table
 
-{"# TBR/mobile: identify passes that switch render targets frequently"}
-rdc passes --switches
-
-{"# Passes with RT_SWITCHES > 2 (high bandwidth pressure on tile-based GPUs)"}
-rdc passes --switches --json | jq '.[] | select(.rt_switches > 2) | {"{ name, rt_switches }"}'
-
 {"# Full dependency graph as DOT (render with Graphviz)"}
 rdc passes --deps --dot | dot -Tsvg -o passes.svg</code></pre>
 

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/docs-astro/src/pages/docs/install.astro

@@ -108,7 +108,11 @@ export RENDERDOC_PYTHON_PATH=$PWD/build/lib</code></pre>
   <pre><code>rdc doctor</code></pre>
   <p>
     This checks renderdoc module availability, Python version compatibility,
-    and system configuration.
+    and system configuration. It also warns when more than one
+    <code>VK_LAYER_RENDERDOC_Capture</code> Vulkan layer is registered (a
+    system-installed RenderDoc plus the rdc-managed one create a split-brain
+    where the loader picks one non-deterministically and capture can silently
+    time out).
   </p>
 
   <h2>Shell Completions</h2>

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/docs-astro/src/pages/docs/remote.astro

@@ -451,6 +451,9 @@ rdc pipeline</code></pre>
   <pre><code># Local mode (default)
 rdc open capture.rdc
 
+# Force a specific replay GPU on a multi-GPU host
+rdc open capture.rdc --gpu INDEX|NAME|DEVICEID
+
 # Proxy mode
 rdc open capture.rdc --proxy HOST[:PORT]|adb://SERIAL
 
@@ -475,6 +478,8 @@ rdc remote capture APP [-o OUTPUT]</code></pre>
     <li><code>--android</code> is mutually exclusive with <code>--proxy</code>, <code>--connect</code>, and <code>--listen</code>.</li>
     <li><code>--listen</code> can be combined with <code>--proxy</code> for Split+Proxy setups.</li>
     <li>For <code>rdc open</code>, <code>--remote</code> is a deprecated alias for <code>--proxy</code> (hidden, shows deprecation warning).</li>
+    <li><code>--gpu INDEX|NAME|DEVICEID</code> forces the replay GPU on a multi-GPU host, by 0-based index, name substring, or device ID (overrides auto-selection).</li>
+    <li>Remote and <code>--proxy</code> hosts given as <code>localhost</code> are auto-normalized to <code>127.0.0.1</code>, because <code>renderdoccmd</code> remoteserver is IPv4-only.</li>
     <li>The daemon has a 30-minute idle timeout by default. Any command resets the timer.</li>
     <li>IPv6 is not currently supported (<code>HOST:PORT</code> parsing uses <code>rsplit(":", 1)</code>).</li>
   </ul>

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/docs-astro/src/pages/docs/usage.astro

@@ -107,9 +107,6 @@ rdc passes
 # Per-pass dependency graph (reads/writes/load/store)
 rdc passes --deps --table
 
-# Add RT_SWITCHES column for TBR/mobile bandwidth analysis
-rdc passes --switches
-
 # Inspect attachments, load/store ops, and dimensions for a pass
 rdc pass GBuffer
 

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/ruff.toml

@@ -7,3 +7,5 @@ select = ["E", "W", "F", "I", "N", "UP", "B"]
 [lint.per-file-ignores]
 # Mock renderdoc module mirrors RenderDoc's CamelCase API names
 "tests/mocks/mock_renderdoc.py" = ["N802", "N803", "N815"]
+# Method-surface stubs mirror RenderDoc's CamelCase API names
+"tests/integration/test_mock_api_sync.py" = ["N802"]

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/scripts/gen-commands.py

@@ -28,7 +28,7 @@ CATEGORIES: list[tuple[str, str, str | None, list[str]]] = [
         "info", "stats", "events", "draws", "event", "draw", "log", "counters",
     ]),
     ("Draw Analysis", "draw-analysis", None, [
-        "pipeline", "bindings",
+        "pipeline", "bindings", "descriptors",
     ]),
     ("Resources", "resources-section", None, [
         "resources", "resource", "usage", "shader", "shaders", "shader-map",

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/src/rdc/_build_renderdoc.py

@@ -440,8 +440,19 @@ def copy_artifacts(build_dir: Path, install_dir: Path, plat: str) -> None:
     _log(f"artifacts copied to {install_dir}")
 
 
-def _install_vulkan_layer(install_dir: Path, build_dir: Path) -> None:
-    """Copy Vulkan layer JSON and register as implicit layer on Windows."""
+def _parse_version(version: str) -> tuple[int, int]:
+    """Parse a RenderDoc tag like ``v1.41`` into ``(major, minor)``."""
+    parts = version.lstrip("v").split(".")
+    return int(parts[0]), int(parts[1])
+
+
+def _install_vulkan_layer(install_dir: Path, build_dir: Path, version: str = RDOC_TAG) -> None:
+    """Copy Vulkan layer JSON and register as implicit layer on Windows.
+
+    Upstream substitutes ``renderdoc.json`` via CMake ``configure_file``, but that block is
+    UNIX-only, so on Windows the template ships with unsubstituted ``@...@`` placeholders.
+    Resolve every templated field here so the layer can self-enable.
+    """
     src_dir = build_dir / "renderdoc"
 
     # Find layer JSON from build output
@@ -459,10 +470,23 @@ def _install_vulkan_layer(install_dir: Path, build_dir: Path) -> None:
 
     import json
 
+    major, minor = _parse_version(version)
     data = json.loads(layer_src.read_text(encoding="utf-8"))
-    data["layer"]["library_path"] = ".\\renderdoc.dll"
+    layer = data["layer"]
+    layer["name"] = "VK_LAYER_RENDERDOC_Capture"
+    layer["library_path"] = ".\\renderdoc.dll"
+    layer["implementation_version"] = str(minor)
+    layer["enable_environment"] = {"ENABLE_VULKAN_RENDERDOC_CAPTURE": "1"}
+    layer["disable_environment"] = {f"DISABLE_VULKAN_RENDERDOC_CAPTURE_{major}_{minor}": "1"}
+
+    serialized = json.dumps(data, indent=2)
+    if "@" in serialized:
+        raise RuntimeError(
+            f"Vulkan layer manifest still contains unsubstituted template vars: {serialized}"
+        )
+
     layer_dst = install_dir / "renderdoc.json"
-    layer_dst.write_text(json.dumps(data, indent=2), encoding="utf-8")
+    layer_dst.write_text(serialized, encoding="utf-8")
     _log(f"Vulkan layer JSON installed to {layer_dst}")
 
     # Register in Windows registry
@@ -789,7 +813,7 @@ def main(argv: list[str] | None = None) -> None:
     copy_artifacts(build_dir, install_dir, plat)
 
     if plat == "windows":
-        _install_vulkan_layer(install_dir, build_dir)
+        _install_vulkan_layer(install_dir, build_dir, args.version)
 
     _log("=== Done ===")
     _log(f'  export RENDERDOC_PYTHON_PATH="{install_dir}"')

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/src/rdc/_platform.py

@@ -7,6 +7,7 @@ callers never need ``sys.platform`` checks themselves.
 from __future__ import annotations
 
 import os
+import shlex
 import signal
 import subprocess
 import sys
@@ -18,8 +19,25 @@ _WIN: bool = sys.platform == "win32"
 _MAC: bool = sys.platform == "darwin"
 
 
+def join_cmdline(args: list[str]) -> str:
+    """Join *args* into a single command-line string, platform-appropriately.
+
+    On Windows, uses subprocess.list2cmdline so that CommandLineToArgvW
+    parses it correctly (double-quote wrapping, backslash escaping).
+    On POSIX, uses shlex.join (single-quote wrapping).
+    """
+    return subprocess.list2cmdline(args) if _WIN else shlex.join(args)
+
+
 def data_dir() -> Path:
-    """Return the per-user data directory for rdc."""
+    """Return the per-user data directory for rdc.
+
+    Honours the ``RDC_DATA_DIR`` environment override (mirrors ``RDC_SESSION``);
+    when unset, falls back to the per-user home-based default.
+    """
+    override = os.environ.get("RDC_DATA_DIR")
+    if override:
+        return Path(override)
     if _WIN:
         base = os.environ.get("LOCALAPPDATA", str(Path.home()))
         return Path(base) / "rdc"

{rdc_cli-0.5.6 → rdc_cli-0.6.1}/src/rdc/_skills/SKILL.md

@@ -26,10 +26,10 @@ Follow this session lifecycle for any capture analysis task:
    - Split thin-client: `rdc open --connect host:port --token TOKEN`
    - Android device: `rdc open capture.rdc --android [--serial SERIAL]`
 2. **Inspect** metadata: `rdc info`, `rdc stats`, `rdc events`
-3. **Navigate** the VFS: `rdc ls /`, `rdc ls /textures`, `rdc cat /pipelines/0`
+3. **Navigate** the VFS: `rdc ls /`, `rdc ls /textures`, `rdc cat /draws/0/pipeline/summary`
 4. **Analyze** specifics: `rdc shaders`, `rdc pipeline`, `rdc resources`, `rdc bindings`
-5. **Debug** shaders: `rdc debug pixel X Y`, `rdc debug vertex EID VTXID`, `rdc debug thread EID GX GY GZ`
-6. **Export** data: `rdc texture EID -o out.png`, `rdc rt EID`, `rdc buffer EID -o buf.bin`, `rdc log`
+5. **Debug** shaders: `rdc debug pixel EID X Y`, `rdc debug vertex EID VTXID`, `rdc debug thread EID GX GY GZ`
+6. **Export** data: `rdc texture ID -o out.png`, `rdc rt EID`, `rdc buffer ID -o buf.bin`, `rdc cbuffer EID --stage ps --binding 0`, `rdc log`
 7. **Close** the session: `rdc close`
 
 ### Session Management
@@ -118,15 +118,16 @@ rdc draws --pass "GBuffer" --json
 ### Trace a pixel
 
 ```bash
-rdc debug pixel 512 384
-rdc debug pixel 512 384 --json    # structured output
-rdc debug pixel 512 384 --trace   # full step-by-step trace
+rdc debug pixel 1024 512 384            # EID first, then X Y
+rdc debug pixel 1024 512 384 --json     # structured output
+rdc debug pixel 1024 512 384 --trace    # full step-by-step trace
 ```
 
 ### Search shaders by name or source
 
 ```bash
-rdc search "main" --type shader
+rdc search "main"                  # regex search over shader disassembly
+rdc search "Sample" --stage ps -C 2
 rdc shaders --name "GBuffer*"
 ```
 
@@ -134,7 +135,15 @@ rdc shaders --name "GBuffer*"
 
 ```bash
 rdc rt EID -o output.png
-rdc texture EID --format png -o tex.png
+rdc rt EID --depth -o depth.png      # export the raw depth attachment
+rdc texture ID -o tex.png            # export a texture by resource ID (PNG)
+```
+
+### Decode a constant buffer
+
+```bash
+rdc cbuffer EID --stage ps --binding 0           # decode to JSON
+rdc cbuffer EID --stage vs --binding 0 --raw -o cbuffer.bin
 ```
 
 ### Browse VFS paths
@@ -142,7 +151,8 @@ rdc texture EID --format png -o tex.png
 ```bash
 rdc ls /
 rdc ls /textures -l
-rdc tree /pipelines --depth 2
+rdc tree /draws/42/pipeline --depth 2     # pipeline state lives under /draws/<eid>/pipeline/
+rdc cat /draws/42/pipeline/summary
 rdc cat /events/42
 ```
 
@@ -168,11 +178,11 @@ rdc-cli provides assertion commands that exit non-zero on failure, designed for
 
 | Command | Purpose |
 |---------|---------|
-| `rdc assert-pixel X Y --expect R,G,B,A` | Assert pixel color at coordinates |
+| `rdc assert-pixel EID X Y --expect "R G B A"` | Assert pixel RGBA (4 space-separated floats) at EID/coordinates |
 | `rdc assert-clean` | Assert no validation errors in capture |
-| `rdc assert-count --type DrawIndexed --min N` | Assert minimum draw call count |
-| `rdc assert-state FIELD VALUE` | Assert pipeline state field matches value |
-| `rdc assert-image EID --ref reference.png` | Assert render target matches reference image |
+| `rdc assert-count <what> --expect N [--op CHOICE]` | Assert a capture metric (e.g. `draws`) satisfies a comparison |
+| `rdc assert-state EID KEY-PATH --expect VALUE` | Assert pipeline state value at EID matches expected |
+| `rdc assert-image EXPECTED ACTUAL [--threshold FLOAT]` | Compare two image files pixel-by-pixel |
 
 Example CI script:
 
@@ -181,8 +191,8 @@ Example CI script:
 set -e
 rdc open test_capture.rdc
 rdc assert-clean
-rdc assert-count --type DrawIndexed --min 10
-rdc assert-pixel 256 256 --expect 1.0,0.0,0.0,1.0
+rdc assert-count draws --expect 10 --op ge
+rdc assert-pixel 1024 256 256 --expect "1.0 0.0 0.0 1.0"
 rdc close
 ```
 
@@ -191,13 +201,13 @@ rdc close
 Modify and replay shaders without recompiling the application:
 
 ```bash
-rdc shader-encodings EID          # list available encodings
-rdc shader EID --source > s.frag  # extract shader source
+rdc shader-encodings                       # list available encodings
+rdc shader EID ps --source > s.frag        # extract shader source
 # ... edit s.frag ...
-rdc shader-build s.frag --encoding glsl  # compile edited shader
-rdc shader-replace EID s.frag     # hot-swap into capture
-rdc shader-restore EID            # revert single shader
-rdc shader-restore-all            # revert all modifications
+rdc shader-build s.frag --stage ps         # compile; prints the built shader ID
+rdc shader-replace EID ps --with <ID>      # hot-swap built shader ID into capture
+rdc shader-restore EID ps                  # revert single shader (STAGE required)
+rdc shader-restore-all                     # revert all modifications
 ```
 
 ## Remote Capture Workflow
@@ -244,6 +254,7 @@ Common failure categories (conceptual, not literal error strings — map from th
 - **version mismatch** — host and target RenderDoc versions differ. Re-run `rdc setup-renderdoc` or `rdc setup-renderdoc --android` to align.
 - **inject failed / ident=0** — injection blocked (Android EMUI, macOS SIP, Windows privilege). Run `rdc doctor` and check the platform-specific detail.
 - **OpenCapture unsupported** — local GPU can't replay the capture's API surface; switch to `--proxy` or `--android` remote replay.
+- **duplicate Vulkan layer** — `rdc doctor` warns when more than one `VK_LAYER_RENDERDOC_Capture` Vulkan layer is registered (a system-installed RenderDoc plus the rdc-managed one create a split-brain). The loader then picks one non-deterministically and capture can silently time out; unregister the extra manifest so only one remains.
 - **not loaded / no session** — forgot `rdc open`; use `rdc status` to inspect.
 
 For long operations (large capture transfers, remote replay init), the CLI has limited progress feedback — this is a known UX gap, not a hang. Wait up to the `--timeout` value before concluding failure.