Merge master into optimize-draw-arrange

Author: DoubleStyx

.github/workflows/release.yml

@@ -233,6 +233,7 @@ jobs:
           cp "${src}/renderide"          "${dist}/"
           cp "${src}/renderide-renderer" "${dist}/"
           cp -R "${src}/xr"              "${dist}/xr"
+          cp -R "${src}/shaders"         "${dist}/shaders"
           case "${PLATFORM}" in
             macos-*)
               latest_macos_loader_dir=""
@@ -255,7 +256,7 @@ jobs:
           import os
           from pathlib import Path
 
-          files = ["renderide", "renderide-renderer", "xr"]
+          files = ["renderide", "renderide-renderer", "xr", "shaders"]
           if os.environ["PLATFORM"].startswith("macos-"):
               files.append("libopenxr_loader.dylib")
           manifest = {
@@ -305,11 +306,12 @@ jobs:
           Copy-Item "$src/renderide.exe"          -Destination $dist
           Copy-Item "$src/renderide-renderer.exe" -Destination $dist
           Copy-Item "$src/xr"                     -Destination $dist -Recurse
+          Copy-Item "$src/shaders"                -Destination $dist -Recurse
           if (-not (Test-Path "$src/openxr_loader.dll")) {
             throw "openxr_loader.dll missing from $src - vendored loader did not copy during build."
           }
           Copy-Item "$src/openxr_loader.dll" -Destination $dist
-          $requiredFiles = @("renderide.exe", "renderide-renderer.exe", "xr", "openxr_loader.dll")
+          $requiredFiles = @("renderide.exe", "renderide-renderer.exe", "xr", "shaders", "openxr_loader.dll")
           $sha256 = [ordered]@{}
           $distRoot = (Resolve-Path $dist).Path
           function Add-FileHash([string]$path) {
@@ -416,7 +418,7 @@ jobs:
             echo ""
             echo "Nightly build of [${SHA}](https://github.com/${GITHUB_REPOSITORY}/commit/${SHA})."
             echo ""
-            echo "Each zip contains the launcher (\`renderide\`), the renderer (\`renderide-renderer\`), and the XR action manifests. Windows and macOS zips also bundle the Khronos OpenXR loader; Linux uses the system OpenXR loader."
+            echo "Each zip contains the launcher (\`renderide\`), the renderer (\`renderide-renderer\`), the runtime shader package, and the XR action manifests. Windows and macOS zips also bundle the Khronos OpenXR loader; Linux uses the system OpenXR loader."
             echo ""
             echo "## Changelog"
             echo ""

.gitignore

@@ -437,8 +437,8 @@ FodyWeavers.xsd
 
 # Generated by Cargo
 # will have compiled files and executables
-debug
-target
+/debug/
+/target/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
@@ -463,4 +463,4 @@ target
 profile.json.gz
 !crates/renderide/src/bin/**
 *.lscache
-config.toml
+config.toml

CONTRIBUTING.md

@@ -11,19 +11,20 @@ members = [
 ]
 
 [profile.dev]
-opt-level = 3
+opt-level = 1
 incremental = true
 codegen-units = 256
+debug = "line-tables-only"
 
 # Global Release Build Settings
 [profile.release]
-debug = true
-strip = "debuginfo"
 opt-level = 3
+incremental = false
+codegen-units = 1
+debug = "line-tables-only"
+strip = "debuginfo"
 debug-assertions = false
 lto = "thin"
-codegen-units = 1
-incremental = false
 overflow-checks = false
 
 

Cargo.toml

@@ -62,7 +62,7 @@ The launcher will start the Resonite host and connect Renderide automatically.
 
 ### macOS
 
-Renderide runs the Resonite Host from the Windows depot and renders natively through Metal. The launcher accepts an explicit Resonite install path, so local builds and release zips should not need hand-written symlinks or `dev-fast` path edits.
+Renderide runs the Resonite Host from the Windows depot and renders natively through Metal. The launcher accepts an explicit Resonite install path, so local builds and release zips should not need hand-written symlinks or source edits.
 
 1. Install the Windows Resonite depot with SteamCMD:
 
@@ -90,7 +90,7 @@ Renderide runs the Resonite Host from the Windows depot and renders natively thr
    ./renderide --resonite-dir "$HOME/Games/ResoniteWindows"
    ```
 
-The macOS release zip contains `renderide`, `renderide-renderer`, `xr`, and the bundled OpenXR loader. If macOS quarantine blocks a downloaded zip, remove the quarantine attribute from the extracted Renderide folder:
+The macOS release zip contains `renderide`, `renderide-renderer`, `shaders`, `xr`, and the bundled OpenXR loader. If macOS quarantine blocks a downloaded zip, remove the quarantine attribute from the extracted Renderide folder:
 
 ```bash
 xattr -dr com.apple.quarantine /path/to/renderide-folder
@@ -120,13 +120,14 @@ Bootstrapper  --shm queues-->  Host (.NET / Resonite)
                               Renderer (renderide-renderer)
 ```
 
-Inside the renderer, work is organized by layer:
+Inside the renderer, work is organized by layer and supporting renderer subsystems:
 
 1. **App** - owns process bootstrap, logging, config loading, shutdown handling, the winit event loop, frame clock, window target, and OpenXR target selection.
 2. **Frontend** - owns Host transport: IPC queues, shared memory, init handshake, input conversion, output-device policy, and lock-step state.
 3. **Scene** - owns the host world mirror: transforms, render spaces, mesh and skinned renderables, lights, cameras, and overrides. Pure data; does not touch wgpu.
-4. **Backend** - owns GPU-facing renderer state: asset pools, material and shader systems, frame resources, draw preparation, render graph assembly, and command recording.
-5. **Runtime** - coordinates frontend, scene, and backend in the fixed per-tick order used by the app driver.
+4. **Assets and materials** - translate host payloads and material properties into resident GPU resources, shader routes, reflected bind groups, and pipeline state.
+5. **Backend, render graph, and GPU** - own device-facing state, frame resources, world-mesh draw preparation, pass registration, transient/history resources, command recording, and presentation helpers.
+6. **Runtime** - coordinates frontend, scene, assets, backend, XR, offscreen tasks, and diagnostics in the fixed per-tick order used by the app driver.
 
 Each tick: poll IPC, integrate a budgeted slice of pending assets, drain offscreen camera/reflection-probe tasks, run the optional OpenXR begin step, complete the lock-step exchange with the host, schedule and render views, present or submit the HMD frame, then update HUD and diagnostics state.
 
@@ -137,13 +138,13 @@ The workspace lives under `crates/`:
 | Crate | Purpose |
 | --- | --- |
 | [`bootstrapper`](crates/bootstrapper) | Builds the `renderide` launcher. Launches the Resonite host and renderer, owns bootstrap IPC (heartbeats, clipboard, renderer argv), and ties child process lifetimes together. |
-| [`renderide`](crates/renderide) | Builds the `renderide-renderer` process and `roundtrip` helper. Owns winit, wgpu, OpenXR, scene mirroring, render graph, materials, assets, diagnostics, and presentation. |
+| [`renderide`](crates/renderide) | Builds the `renderide-renderer` process and `roundtrip` helper. Owns winit, wgpu, OpenXR, scene mirroring, asset integration, materials, particles, render graph, diagnostics, and presentation. |
 | [`renderide-shared`](crates/renderide-shared) | Generated IPC types, binary packing helpers, shared-memory accessors/writers, and dual-queue wrappers. |
 | [`interprocess`](crates/interprocess) | Cloudtoid-compatible shared-memory ring queues used by every IPC channel. |
 | [`logger`](crates/logger) | File-first logging used by the bootstrapper, host capture, and renderer. |
 | [`renderide-test`](crates/renderide-test) | Integration test harness that drives the renderer end-to-end. |
 
-A C# generator under [`generators/SharedTypeGenerator`](generators/SharedTypeGenerator) emits `crates/renderide-shared/src/shared.rs`. Its test project lives under [`generators/SharedTypeGenerator.Tests`](generators/SharedTypeGenerator.Tests) and uses the `roundtrip` binary to compare C# and Rust packing. [`RenderideMod`](RenderideMod) contains the host-side Resonite mod, and [`third_party/openxr_loader`](third_party/openxr_loader) contains vendored OpenXR loader binaries used by release artifacts on Windows and macOS.
+A C# generator under [`generators/SharedTypeGenerator`](generators/SharedTypeGenerator) emits `crates/renderide-shared/src/shared.rs`. Its test project lives under [`generators/SharedTypeGenerator.Tests`](generators/SharedTypeGenerator.Tests) and uses the `roundtrip` binary to compare C# and Rust packing. [`RenderideMod`](RenderideMod) contains the host-side Resonite mod, [`crates/renderide/assets`](crates/renderide/assets) contains runtime XR bindings and the shipped skybox model, and [`third_party/openxr_loader`](third_party/openxr_loader) contains vendored OpenXR loader binaries used by release artifacts on Windows and macOS.
 
 ## Feature flags
 
@@ -152,15 +153,15 @@ The `renderide` crate exposes opt-in Cargo features for capabilities that depend
 Multiple features can be combined as a single space-separated argument:
 
 ```bash
-cargo build --features "tracy video-textures"
+cargo build --release --features "tracy video-textures"
 ```
 
 ### `tracy`
 
 CPU and GPU profiling integration. Activates `profiling::scope!` zones, frame marks, and `wgpu-profiler` GPU timestamp queries that stream into the [Tracy](https://github.com/wolfpld/tracy) profiler GUI on port 8086. The Tracy client links statically, so this feature has no system-library prerequisites.
 
 ```bash
-cargo build --features tracy
+cargo build --release --features tracy
 ```
 
 See [Profiling](#profiling) for adapter requirements and connection details.
@@ -176,7 +177,7 @@ System dependencies:
 - **Windows**: the official GStreamer MSVC SDK plus a working `pkg-config` (`pkgconf` rather than `pkgconfiglite`).
 
 ```bash
-cargo build --features video-textures
+cargo build --release --features video-textures
 ```
 
 ## Configuration
@@ -197,7 +198,7 @@ If timestamp queries are unavailable, a warning is logged and Tracy still receiv
 ### Building with profiling enabled
 
 ```bash
-cargo build --profile dev-fast --features tracy
+cargo build --release --features tracy
 ```
 
 ### Connecting Tracy
@@ -218,7 +219,7 @@ Linux, macOS, and Windows are all tier-1 targets and exercised in CI ([`.github/
 
 ## Contributing
 
-Contributions are welcome. The workspace builds with the standard Cargo commands listed above; lints (`cargo clippy --all-targets --all-features`) and formatting (`cargo fmt`, plus `taplo fmt` when editing `Cargo.toml`) are expected to be clean before opening a pull request, and CI runs the same checks across all three platforms.
+Contributions are welcome. The workspace builds with the standard Cargo commands listed above; lints (`cargo clippy --all-targets`, with feature coverage matching CI) and formatting (`cargo fmt`, plus `taplo fmt` when editing `Cargo.toml`) are expected to be clean before opening a pull request, and CI runs the same checks across all three platforms.
 
 Read [`CONTRIBUTING.md`](CONTRIBUTING.md) to learn how to get started.
 

README.md

@@ -447,23 +447,26 @@ fn decode_hex_32(hex: &str) -> Result<[u8; 32], UpdateError> {
 
 /// Returns the required install entries for a release platform token.
 pub(super) fn required_bundle_entries(platform: &str) -> Vec<BundleEntry> {
-    let mut entries = Vec::with_capacity(5);
+    let mut entries = Vec::with_capacity(6);
     match platform {
         "windows-x86_64" | "windows-aarch64" => {
             entries.push(BundleEntry::file("renderide.exe", true));
             entries.push(BundleEntry::file("renderide-renderer.exe", false));
             entries.push(BundleEntry::directory("xr"));
+            entries.push(BundleEntry::directory("shaders"));
             entries.push(BundleEntry::file("openxr_loader.dll", false));
         }
         "linux-x86_64" | "linux-aarch64" => {
             entries.push(BundleEntry::file("renderide", true));
             entries.push(BundleEntry::file("renderide-renderer", false));
             entries.push(BundleEntry::directory("xr"));
+            entries.push(BundleEntry::directory("shaders"));
         }
         "macos-x86_64" | "macos-aarch64" => {
             entries.push(BundleEntry::file("renderide", true));
             entries.push(BundleEntry::file("renderide-renderer", false));
             entries.push(BundleEntry::directory("xr"));
+            entries.push(BundleEntry::directory("shaders"));
             entries.push(BundleEntry::file("libopenxr_loader.dylib", false));
         }
         _ => {}
@@ -567,7 +570,7 @@ mod tests {
             "tag": candidate.tag,
             "commit": candidate.commit,
             "platform": metadata.platform,
-            "required_files": ["renderide", "renderide-renderer", "xr"],
+            "required_files": ["renderide", "renderide-renderer", "xr", "shaders"],
             "sha256": {
                 "renderide": LAUNCHER_SHA256,
                 "renderide-renderer": RENDERER_SHA256
@@ -611,6 +614,10 @@ mod tests {
                         || entry.relative == "renderide-renderer.exe"),
                 "{platform} should include renderer binary"
             );
+            assert!(
+                entries.iter().any(|entry| entry.relative == "shaders"),
+                "{platform} should include runtime shader package"
+            );
         }
     }
 
@@ -619,6 +626,8 @@ mod tests {
         fs::write(root.join("renderide-renderer"), b"renderer").expect("write renderer");
         fs::create_dir_all(root.join("xr")).expect("create xr");
         fs::write(root.join("xr/actions.toml"), xr_actions).expect("write xr actions");
+        fs::create_dir_all(root.join("shaders")).expect("create shaders");
+        fs::write(root.join("shaders/shader_manifest.toml"), b"{}").expect("write shader manifest");
     }
 
     fn linux_manifest_with_sha256(sha256: serde_json::Value) -> String {
@@ -628,7 +637,7 @@ mod tests {
             "tag": "nightly-2026-05-27-2222222",
             "commit": "2222222222222222222222222222222222222222",
             "platform": "linux-x86_64",
-            "required_files": ["renderide", "renderide-renderer", "xr"],
+            "required_files": ["renderide", "renderide-renderer", "xr", "shaders"],
             "sha256": sha256
         })
         .to_string()
@@ -638,7 +647,8 @@ mod tests {
         serde_json::json!({
             "renderide": LAUNCHER_SHA256,
             "renderide-renderer": RENDERER_SHA256,
-            "xr/actions.toml": EMPTY_JSON_SHA256
+            "xr/actions.toml": EMPTY_JSON_SHA256,
+            "shaders/shader_manifest.toml": EMPTY_JSON_SHA256
         })
     }
 
@@ -681,6 +691,7 @@ mod tests {
             "renderide": LAUNCHER_SHA256,
             "renderide-renderer": RENDERER_SHA256,
             "xr/actions.toml": EMPTY_JSON_SHA256,
+            "shaders/shader_manifest.toml": EMPTY_JSON_SHA256,
             "renderide-release.json": EMPTY_JSON_SHA256
         }));
 
@@ -695,6 +706,7 @@ mod tests {
             "renderide": LAUNCHER_SHA256,
             "renderide-renderer": RENDERER_SHA256,
             "xr/actions.toml": EMPTY_JSON_SHA256,
+            "shaders/shader_manifest.toml": EMPTY_JSON_SHA256,
             "xr/../escape": EMPTY_JSON_SHA256
         }));
 

crates/bootstrapper/src/updater/bundle.rs

@@ -548,11 +548,12 @@ mod tests {
             "tag": UPDATE_TAG,
             "commit": UPDATE_COMMIT,
             "platform": PLATFORM,
-            "required_files": ["renderide", "renderide-renderer", "xr"],
+            "required_files": ["renderide", "renderide-renderer", "xr", "shaders"],
             "sha256": {
                 "renderide": "ec9a6e9fe278eb1a471fbab6f40367d8548078b651d9c71581c57c2a6ca379e0",
                 "renderide-renderer": "6bd52b204f5b4cffb267597f37d0fa62bae229341394dfec0e5d42439d8b722c",
-                "xr/actions.json": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a"
+                "xr/actions.json": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a",
+                "shaders/shader_manifest.toml": "44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a"
             }
         })
         .to_string()
@@ -593,6 +594,7 @@ mod tests {
             &archive_path,
             &[
                 TestZipEntry::Directory("xr/"),
+                TestZipEntry::Directory("shaders/"),
                 TestZipEntry::File {
                     name: "renderide-release.json",
                     contents: manifest.as_bytes(),
@@ -618,6 +620,11 @@ mod tests {
                     contents: b"{}",
                     unix_mode: Some(ZIP_REGULAR_FILE_MODE),
                 },
+                TestZipEntry::File {
+                    name: "shaders/shader_manifest.toml",
+                    contents: b"{}",
+                    unix_mode: Some(ZIP_REGULAR_FILE_MODE),
+                },
             ],
         );
 
@@ -641,6 +648,7 @@ mod tests {
             &archive_path,
             &[
                 TestZipEntry::Directory(&format!("{root_name}/xr/")),
+                TestZipEntry::Directory(&format!("{root_name}/shaders/")),
                 TestZipEntry::File {
                     name: &format!("{root_name}/renderide-release.json"),
                     contents: manifest.as_bytes(),
@@ -666,6 +674,11 @@ mod tests {
                     contents: b"{}",
                     unix_mode: Some(ZIP_REGULAR_FILE_MODE),
                 },
+                TestZipEntry::File {
+                    name: &format!("{root_name}/shaders/shader_manifest.toml"),
+                    contents: b"{}",
+                    unix_mode: Some(ZIP_REGULAR_FILE_MODE),
+                },
             ],
         );
 

crates/bootstrapper/src/updater/install.rs

@@ -34,11 +34,14 @@ impl CurrentOwnerSecurityAttributes {
             .encode_utf16()
             .chain(std::iter::once(0))
             .collect();
+        // SAFETY: `sddl` is a valid NUL-terminated UTF-16 string that outlives the call, and
+        // `descriptor` is a valid out-pointer the API fills with a LocalAlloc'd descriptor that
+        // `Drop` releases via `LocalFree`.
         let ok = unsafe {
             ConvertStringSecurityDescriptorToSecurityDescriptorW(
                 sddl.as_ptr(),
                 SDDL_REVISION_1,
-                &mut descriptor,
+                &raw mut descriptor,
                 null_mut(),
             )
         };
@@ -57,14 +60,17 @@ impl CurrentOwnerSecurityAttributes {
 
     /// Pointer passed to Win32 object creation calls.
     pub(crate) const fn as_ptr(&self) -> *const SECURITY_ATTRIBUTES {
-        &self.attrs
+        &raw const self.attrs
     }
 }
 
 #[cfg(windows)]
 impl Drop for CurrentOwnerSecurityAttributes {
     fn drop(&mut self) {
         if !self.descriptor.is_null() {
+            // SAFETY: `descriptor` was allocated by
+            // `ConvertStringSecurityDescriptorToSecurityDescriptorW`, which documents LocalFree
+            // as the matching release, and it is freed exactly once here.
             unsafe {
                 LocalFree(self.descriptor.cast());
             }