Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b399bb810a | ||
|
|
7bf90508c3 | ||
|
|
c6849a35d9 | ||
|
|
7bb622364e |
No files matched your search
@@ -0,0 +1,12 @@
|
|||||||
|
# Forge (Windows) — rebuild pair from engine main ≥ 615e852f, re-judge the render verdicts, pin (2026-10-05)
|
||||||
|
|
||||||
|
macOS pair `615e852f` (code `c76f2ecc`) is published here. Windows is still `b1bc0aef` (2026-09-28).
|
||||||
|
|
||||||
|
1. Build the Windows editor + console pair from `tinqs/engine` main with the `windows-x64` manifest flags
|
||||||
|
(`platform=windows target=editor arch=x86_64 module_mono_enabled=yes d3d12=yes angle=yes accesskit=yes`),
|
||||||
|
regenerate GodotSharp from that exact binary, smoke (0 wrapper errors), publish here, update `manifest.json` +
|
||||||
|
`README.md`.
|
||||||
|
2. Then pin `tinqs/required_engine_build="4.7.2@<hash7+>"` in `ariki-game/project.godot` (both platforms on the same commit).
|
||||||
|
3. Re-judge on Windows what the Mac measured (frame GPU-bound on M1): static shadow cache default (now OFF on Apple
|
||||||
|
silicon game-side, ON elsewhere — keep ON on Windows only if `inverted` ≥ `cache_off` fps), GPU veg bands, HLOD.
|
||||||
|
Full recipe + numbers: `ariki-game/.agents/handoffs/2026-10-05-forge-windows-render-bench-handover.md`.
|
||||||
@@ -31,10 +31,10 @@ into GodotSharp, so GodotSharp had to be regenerated — and must ship here alon
|
|||||||
|
|
||||||
| Platform | Engine | Terrain3D | GodotSharp shipped? |
|
| Platform | Engine | Terrain3D | GodotSharp shipped? |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| `engine/macos-arm64/` | **4.7.2** (`51ed21d5`) — static shadow cache + tile budget + live caster size cull + inverted contract switch, `get_video_adapter_memory()`, device-lost diagnostics | built-in module | ✅ yes (`GodotSharp/`) |
|
| `engine/macos-arm64/` | **4.7.2** (`b0daf759`) — GPU-driven MultiMesh culling Stage A+B+B2+C (HZB occlusion, default off) + static cache single-sample / hard-filter options + true Metal GPU profile + parallel shadow fill, on top of the shadow diet, `get_video_adapter_memory()`, device-lost diagnostics | built-in module | ✅ yes (`GodotSharp/`) |
|
||||||
| `engine/windows-x64/` | **4.7.2** (`b1bc0aef`) — upstream bugfixes + static shadow cache (no memory query yet) | built-in module | ✅ yes (`GodotSharp/`) |
|
| `engine/windows-x64/` | **4.7.2** (`b1bc0aef`) — upstream bugfixes + static shadow cache (no memory query yet) | built-in module | ✅ yes (`GodotSharp/`) |
|
||||||
|
|
||||||
Mac is engine `51ed21d5` as of 2026-10-05 (`--version` prints `4.7.2.stable.mono.custom_build.51ed21d5d`): 4.7.2 + static shadow cache (tile budget, live caster screen-size cull, inverted-contract switch) + the video adapter memory query + GPU device-lost diagnostics (engine wiki `shadow-pass-diet-2026-10-05.md`, `gpu-device-lost-diagnostics.md`). Windows is `b1bc0aef` (2026-09-28, 4.7.2 + static shadow cache) and gets the memory query when Forge rebuilds from main. The engine source repo stays private. Check `manifest.json` for sha256. The 4.7 Windows cutover handoff is resolved: [`.agents/handoffs/forge-windows-4.7.md`](.agents/handoffs/forge-windows-4.7.md).
|
Mac is engine `b0daf759` as of 2026-10-05 late evening (`--version` prints `4.7.2.stable.mono.custom_build.b0daf759b`): GPU culling Stage C (previous-frame depth-pyramid occlusion, default off), zero per-frame cull uploads, static-cache single-sample + hard-filter options (default = unchanged), true per-pass Metal GPU profile, parallel shadow instance fill, on top of Stage B2 CPU band skip for GPU-culled MultiMeshes (the x4.7 draw explosion of `gpucull veg on` is gone; the path still stays off by default) on top of everything 51ed21d5 had (shadow diet incl. tile budget / live caster size cull / inverted-contract switch, video adapter memory query, GPU device-lost diagnostics) plus GPU-driven MultiMesh culling Stage A (compute frustum cull + indirect draws, `multimesh_set_gpu_cull`) and Stage B (per-instance GPU LOD bands, `multimesh_set_gpu_lods`), real Metal GPU timestamps (`renderGpuMs`), staggered far cascades, fit-to-visible-depth (SDSM-lite, default off), the Metal argument-buffer copy-queue stall fix and the Vulkan breadcrumb barrier fix (#185). Windows is `b1bc0aef` (2026-09-28, 4.7.2 + static shadow cache) and gets all of the above when Forge rebuilds from main - do not pin `required_engine_build` before that. Windows is `b1bc0aef` (2026-09-28, 4.7.2 + static shadow cache) and gets the memory query when Forge rebuilds from main. The engine source repo stays private. Check `manifest.json` for sha256. The 4.7 Windows cutover handoff is resolved: [`.agents/handoffs/forge-windows-4.7.md`](.agents/handoffs/forge-windows-4.7.md).
|
||||||
|
|
||||||
Long-term: CI (Gitea Actions) builds on push and publishes here / to S3 —
|
Long-term: CI (Gitea Actions) builds on push and publishes here / to S3 —
|
||||||
`docs/ai/plans/build-pipeline-architecture-2026-06-07.md`.
|
`docs/ai/plans/build-pipeline-architecture-2026-06-07.md`.
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+5
-5
@@ -4,16 +4,16 @@
|
|||||||
"macos-arm64": {
|
"macos-arm64": {
|
||||||
"binary": "engine/macos-arm64/tinqs.macos.editor.arm64.mono",
|
"binary": "engine/macos-arm64/tinqs.macos.editor.arm64.mono",
|
||||||
"godotsharp": "engine/macos-arm64/GodotSharp",
|
"godotsharp": "engine/macos-arm64/GodotSharp",
|
||||||
"version": "4.7.2.stable.mono.custom_build.51ed21d5d",
|
"version": "4.7.2.stable.mono.custom_build.b0daf759b",
|
||||||
"engine_repo": "tinqs/engine",
|
"engine_repo": "tinqs/engine",
|
||||||
"engine_commit": "51ed21d5",
|
"engine_commit": "b0daf759",
|
||||||
"sha256": "630581370fa046800b66d9fe212b64c682d07ad0326dba4fe705c84089267917",
|
"sha256": "7660089da758cc3d7bae1766250040b7af3bbaccb57d3fbb07dfe3648ed212ac",
|
||||||
"target": "editor",
|
"target": "editor",
|
||||||
"built_on": "2026-10-05",
|
"built_on": "2026-10-05",
|
||||||
"built_by": "Ozan/Kraken via Claude (shadow pass diet + device-lost diagnostics on top of the video adapter memory query)",
|
"built_by": "Ozan/Kraken via Claude (engine round 2 evening: Stage C + housekeeping, single-sample static cache, Metal profiler fix, parallel shadow fill)",
|
||||||
"toolchain": "Xcode (Apple Silicon), SCons, VulkanSDK 1.4.350.0",
|
"toolchain": "Xcode (Apple Silicon), SCons, VulkanSDK 1.4.350.0",
|
||||||
"scons_flags": "platform=macos target=editor arch=arm64 module_mono_enabled=yes vulkan_sdk_path=~/VulkanSDK/1.4.350.0/macOS",
|
"scons_flags": "platform=macos target=editor arch=arm64 module_mono_enabled=yes vulkan_sdk_path=~/VulkanSDK/1.4.350.0/macOS",
|
||||||
"note": "Mac only. Engine 51ed21d5 (= code commit 2012a2d0 + a 6-line wiki commit) = 4.7.2 + static shadow cache + get_video_adapter_memory + 2026-10-05 round: static_tiles_per_frame (default 2), live_caster_min_screen_radius (default 0.005), static_default_static + static_dynamic_caster_layers (layer 19, off by default), GPU device-lost report in every build (adapter/driver/device-fault/video memory line), runtime gpu_breadcrumbs setting / --gpu-breadcrumbs, Metal command-buffer error report. GodotSharp REGENERATED from this binary - install binary + GodotSharp together via the update-engine skill. Game side needs ariki-game >= a3a7aa4ac for env staticshadow contract|budget|sizecull and /perf renderCpuMs/renderGpuMs/gc. Windows in this repo is still b1bc0aef until Forge rebuilds from main."
|
"note": "Mac only. Engine b0daf759 on top of 615e852f: GPU-driven MultiMesh culling Stage C (previous-frame HZB occlusion for the camera cull set, default off: multimesh_gpu_cull_set_occlusion / rendering/occlusion_culling/gpu_hzb) + housekeeping (one command buffer per MultiMesh, zero per-frame uploads, one dispatch per MultiMesh, RENDERING_INFO_GPU_CULL_DISPATCHES/INDIRECT_DRAWS_IN_FRAME = 11/12); static shadow cache single-sample mode (static_single_sample + directional_static_shadow_set_single_sample, default off) and static_soft_filter (default true = today's soft PCF; false = hard 2x2, measured -16 ms GPU at a village stand on M1 with the cache on); Metal GPU profile timestamps drain before sampling (per-pass table is true now); shadow passes fill instance data in parallel. GodotSharp regenerated (MultimeshGpuCullSetOcclusion, DirectionalStaticShadowSetSingleSample present). Smoke on Kraken: 0 wrapper errors, world + large village. windows-x64 untouched (still b1bc0aef) - Forge rebuilds from main (builds/.agents/handoffs/forge-windows-render-bench-2026-10-05.md), then pin."
|
||||||
},
|
},
|
||||||
"windows-x64": {
|
"windows-x64": {
|
||||||
"binary": "engine/windows-x64/tinqs.windows.editor.x86_64.mono.exe",
|
"binary": "engine/windows-x64/tinqs.windows.editor.x86_64.mono.exe",
|
||||||
|
|||||||
Reference in new issue
Block a user