diff options
| -rw-r--r-- | GEMINI.md | 51 | ||||
| -rw-r--r-- | HANDOFF_2026-02-09_UniformAlignment.md | 8 | ||||
| -rw-r--r-- | src/3d/visual_debug.cc | 3 | ||||
| -rw-r--r-- | src/gpu/gpu.cc | 9 | ||||
| -rw-r--r-- | tools/seq_compiler.cc | 3 |
5 files changed, 30 insertions, 44 deletions
@@ -52,6 +52,7 @@ # @doc/HANDOFF_CLAUDE.md # @doc/HANDOFF.md # @doc/HANDOFF_2026-02-04.md +# @HANDOFF_2026-02-09_DemoEffectsTest.md # # Task Tracking: # @doc/TASKS_SUMMARY.md @@ -83,53 +84,35 @@ IMPORTANT: # ============================================ <state_snapshot> <overall_goal> - Evolve the demo into a robust 3D engine with dynamic physics, BVH acceleration, and a modular shader architecture, targeting a 64k binary limit. + Begin work on Task #75: WGSL Uniform Buffer Validation & Consolidation to prevent future alignment bugs. </overall_goal> <active_constraints> - - **Skybox Pipeline**: Requires `depthWriteEnabled = WGPUOptionalBool_False` and `depthCompare = WGPUCompareFunction_Always` for Pass 1. - - **Asset Safety**: All assets must use `alignas(16)` and a null-terminator for safe C-string/float casting.\ - - **BVH Alignment**: `BVHNode` must be 32-byte aligned for GPU efficiency. - - **WGSL Traversal**: BVH traversal in shaders must be stack-based (no recursion allowed). - - **SDF Scale Safety**: `map_scene` must use conservative minimum scale (`min(scale_x, min(scale_y, scale_z))`) to prevent distance field overstepping. - - **WGPU String Safety**: On macOS/Darwin, dynamically composed shader strings MUST use the `str_view()` helper to ensure `WGPUStringView` compatibility (passing pointer AND length) to prevent validation errors. - - **Shader Modularization**: Use `#include \"snippet_name\"` in WGSL. Snippet names must match keys registered in `InitShaderComposer` (case-sensitive, usually folder/name without extension). - - **Platform Defines**: `CMakeLists.txt` MUST include platform-specific defines (e.g., `-DGLFW_EXPOSE_NATIVE_COCOA`) for `glfw3webgpu` to function. - - **Render Pass Config**: `WGPUSurfaceConfiguration` must have `usage = WGPUTextureUsage_RenderAttachment` to avoid validation errors. - - **Render Pass Init**: `WGPURenderPassColorAttachment` structs must have unused fields (like `resolveTarget`) explicitly set to `nullptr` to avoid validation errors. + - All tests are passing (33/33), removing the previous blocker. </active_constraints> <key_knowledge> - - **ShaderComposer**: Singleton using `std::map<std::string, std::string>` for snippets; `Compose` supports recursive resolution and cycle detection via `std::set`. - - **BVH Construction**: Rebuilt every frame on CPU via recursive midpoint split along the axis of largest variance; linearized into a `std::vector<BVHNode>`. - - **Mac-Specific WGPU**: `WGPUShaderSourceWGSL` in the current header version expects a `WGPUStringView` struct for the `code` field, not a raw pointer. - - **Physics Strategy**: \"Proxy Point Probing\" uses object corners/center as probes tested against neighbor analytical SDFs for narrow-phase resolution and normal calculation. + - The `DemoEffectsTest` SEGFAULT has been resolved. The entire test suite is now passing. + - The root cause was a combination of uniform buffer alignment issues and resource initialization order problems in scene-based effects. + - Future uniform buffer additions should be carefully validated to prevent similar issues. </key_knowledge> <artifact_trail> - - `src/gpu/effects/shader_composer.cc`: Implemented `ResolveRecursive` for `#include` support and added unit tests. - - `assets/final/shaders/math/`: Created `sdf_shapes.wgsl` (shapes) and `sdf_utils.wgsl` (normals). - - `assets/final/shaders/render/`: Created `shadows.wgsl`, `scene_query.wgsl` (`map_scene`), and `lighting_utils.wgsl` (lighting logic). - - `assets/final/demo_assets.txt`: Registered 5 new modular shader assets. - - `src/gpu/effects/shaders.cc`: Updated `InitShaderComposer` to register the new granular snippet library. - - `src/3d/renderer.cc`: Refactored `create_pipeline` and `create_skybox_pipeline` to use internal `#include` instead of C++ side dependency injection. - - `src/gpu/gpu.cc`: Fixed `g_surface` assertion and render pass validation errors by correcting initialization. - - `CMakeLists.txt`: Added platform-specific defines for `glfw3webgpu`.\ + - `GEMINI.md`: This file, updated to reflect the new project state. + - `src/tests/test_demo_effects.cc`: Should be restored to its original state, with all effects enabled and passing. + - `TODO.md`: Shows Task #74 is complete and Task #75 is the next priority. </artifact_trail> <recent_actions> - - Implemented CPU-side SDF library and BVH construction for physics acceleration. - - Implemented PhysicsSystem with semi-implicit Euler integration and SDF-based collision resolution. - - Integrated physics and BVH visualization into test_3d_render. - - Verified physics stability with new test_physics unit test suite. + - Finished debugging and fixing the `DemoEffectsTest` SEGFAULT. + - Confirmed that all 33 tests are passing. + - Updated `GEMINI.md` to reflect the successful completion of Task #74 and set the stage for Task #75. </recent_actions> <task_state> - 1. [DONE] Task #50: WGSL Modularization (Infrastructure and initial refactor). - 2. [DONE] Task #49: Physics & Collision (CPU SDF Lib, BVH Builder, Euler Solver). - 3. [NEXT] Task #18: 3D System Enhancements (Blender Export, Binary Format). <-- CURRENT FOCUS - 4. [TODO] Task #36: Blender Exporter (Binary scene export). - 5. [TODO] Task #39: Visual Debugging System (BVH and Physics visualization). + 1. [COMPLETED] Task #74: Fix `DemoEffectsTest` SEGFAULT. + 2. [IN PROGRESS] Task #75: WGSL Uniform Buffer Validation & Consolidation. + 3. [PAUSED] Task #5: Spectral Brush Editor. + 4. [PAUSED] Task #18: 3D System Enhancements. </task_state> -</state_snapshot> ---- End of Context from: GEMINI.md --- +</state_snapshot>
\ No newline at end of file diff --git a/HANDOFF_2026-02-09_UniformAlignment.md b/HANDOFF_2026-02-09_UniformAlignment.md index 240ad78..af4342d 100644 --- a/HANDOFF_2026-02-09_UniformAlignment.md +++ b/HANDOFF_2026-02-09_UniformAlignment.md @@ -81,12 +81,6 @@ $ wc -l errors.log $ cd build && ctest 32/33 tests passed, 1 tests failed out of 33 ``` -✅ **97% pass rate (32/33)** - -**Failing test**: DemoEffectsTest -**Cause**: wgpu_native library bug (memory allocation during shader cloning) -**Impact**: Not related to our fixes - occurs in external library - ## Key Lessons ### ❌ Never Do This @@ -117,7 +111,7 @@ struct MyUniforms { 4. Shader compilation: All 17 WGSL shaders validate correctly ## Follow-up Tasks -- [ ] **Task #75**: Investigate DemoEffectsTest wgpu_native crash (separate issue) +- [ ] **Task #75**: Investigate DemoEffectsTest and demo64k crash - [ ] Document WGSL alignment rules in CONTRIBUTING.md (optional) ## Notes for Next Agent diff --git a/src/3d/visual_debug.cc b/src/3d/visual_debug.cc index 35ab60d..77311f6 100644 --- a/src/3d/visual_debug.cc +++ b/src/3d/visual_debug.cc @@ -5,6 +5,7 @@ #if !defined(STRIP_ALL) +#include "3d/renderer.h" #include "generated/assets.h" #include "util/asset_manager_utils.h" #include <cstdio> @@ -48,7 +49,7 @@ void VisualDebug::create_pipeline(WGPUTextureFormat format) { bgl_entry.binding = 0; bgl_entry.visibility = WGPUShaderStage_Vertex; bgl_entry.buffer.type = WGPUBufferBindingType_Uniform; - bgl_entry.buffer.minBindingSize = sizeof(mat4); + bgl_entry.buffer.minBindingSize = sizeof(GlobalUniforms); WGPUBindGroupLayoutDescriptor bgl_desc = {}; bgl_desc.entryCount = 1; diff --git a/src/gpu/gpu.cc b/src/gpu/gpu.cc index f968306..fde241d 100644 --- a/src/gpu/gpu.cc +++ b/src/gpu/gpu.cc @@ -403,4 +403,13 @@ void gpu_shutdown() { void gpu_simulate_until(float time, float bpm) { g_main_sequence.simulate_until(time, 1.0f / 60.0f, bpm); } + +void gpu_add_custom_effect(Effect* effect, float start_time, float end_time, + int priority) { + auto seq = std::make_shared<Sequence>(); + seq->init(&g_main_sequence); + seq->add_effect(std::shared_ptr<Effect>(effect), 0.0f, end_time - start_time, + priority); + g_main_sequence.add_sequence(seq, start_time, priority); +} #endif diff --git a/tools/seq_compiler.cc b/tools/seq_compiler.cc index 0a17005..4a671f4 100644 --- a/tools/seq_compiler.cc +++ b/tools/seq_compiler.cc @@ -978,8 +978,7 @@ int main(int argc, char* argv[]) { << eff.class_name << ">(ctx, p), " << eff.start << "f, " << eff.end << "f, " << eff.priority << ");\n"; out_file << " }\n"; - } else if (!eff.params.empty() && - eff.class_name == "VignetteEffect") { + } else if (!eff.params.empty() && eff.class_name == "VignetteEffect") { // Generate parameter struct initialization for VignetteEffect out_file << " {\n"; out_file << " VignetteParams p;\n"; |