diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CNN_DEBUG.md | 4 | ||||
| -rw-r--r-- | doc/CNN_EFFECT.md | 4 | ||||
| -rw-r--r-- | doc/CNN_FLATTEN_ANALYSIS.md | 2 | ||||
| -rw-r--r-- | doc/CNN_V2.md | 12 | ||||
| -rw-r--r-- | doc/CNN_V2_BINARY_FORMAT.md | 2 | ||||
| -rw-r--r-- | doc/EFFECT_WORKFLOW.md | 22 | ||||
| -rw-r--r-- | doc/RECIPE.md | 6 | ||||
| -rw-r--r-- | doc/WORKSPACE_SYSTEM.md | 2 |
8 files changed, 27 insertions, 27 deletions
diff --git a/doc/CNN_DEBUG.md b/doc/CNN_DEBUG.md index dba0b60..ba220a0 100644 --- a/doc/CNN_DEBUG.md +++ b/doc/CNN_DEBUG.md @@ -11,7 +11,7 @@ CNN post-processing effect showed black screen when activated at 11.50s, despite **Fix**: Moved capture before loop starts (lines 308-346). Capture now copies `framebuffer_a` to `captured_frame` auxiliary texture ONCE before any post-effects run. ### Bug 2: Missing Uniforms Update ⚠️ CRITICAL -**Location**: `src/gpu/effects/cnn_effect.cc` +**Location**: `src/effects/cnn_effect.cc` **Issue**: `CNNEffect::update_bind_group()` never updated `uniforms_` buffer. `uniforms.resolution` uninitialized (0,0 or garbage) → UV calculation `p.xy / uniforms.resolution` produced NaN → all texture samples black. **Fix**: Added uniforms update before bind group creation (lines 132-142): ```cpp @@ -34,7 +34,7 @@ uniforms_.update(ctx_.queue, u); ## Files Modified - `src/gpu/effect.cc`: Lines 308-346 (capture timing) -- `src/gpu/effects/cnn_effect.cc`: Lines 132-142 (uniforms update) +- `src/effects/cnn_effect.cc`: Lines 132-142 (uniforms update) ## Verification Test: `demo64k --seek 11.5` diff --git a/doc/CNN_EFFECT.md b/doc/CNN_EFFECT.md index c14130a..40f095e 100644 --- a/doc/CNN_EFFECT.md +++ b/doc/CNN_EFFECT.md @@ -80,7 +80,7 @@ CNNEffect supports multi-layer networks via automatic effect chaining: ### File Structure ``` -src/gpu/effects/ +src/effects/ cnn_effect.h/cc # CNNEffect class + framebuffer capture workspaces/main/shaders/cnn/ @@ -156,7 +156,7 @@ cmake --build build -j4 && ./build/demo64k **Single layer (manual):** ```cpp -#include "gpu/effects/cnn_effect.h" +#include "effects/cnn_effect.h" CNNEffectParams p; p.layer_index = 0; diff --git a/doc/CNN_FLATTEN_ANALYSIS.md b/doc/CNN_FLATTEN_ANALYSIS.md index 88f3db6..bf63c5d 100644 --- a/doc/CNN_FLATTEN_ANALYSIS.md +++ b/doc/CNN_FLATTEN_ANALYSIS.md @@ -185,5 +185,5 @@ These yield better size/performance than shader architecture changes. - `doc/CNN_EFFECT.md` - CNN implementation details - `doc/CNN.md` - High-level CNN design -- `src/gpu/effects/cnn_effect.cc` - Current implementation +- `src/effects/cnn_effect.cc` - Current implementation - `workspaces/main/shaders/cnn_*.wgsl` - Shader snippets diff --git a/doc/CNN_V2.md b/doc/CNN_V2.md index 2d1d4c4..b7fd6f8 100644 --- a/doc/CNN_V2.md +++ b/doc/CNN_V2.md @@ -520,13 +520,13 @@ See `doc/CNN_V2_WEB_TOOL.md` for detailed documentation ### Phase 2: C++ Effect Class -- [ ] `src/gpu/effects/cnn_v2_effect.h` - Header +- [ ] `src/effects/cnn_v2_effect.h` - Header - [ ] Class declaration inheriting from `PostProcessEffect` - [ ] Static features texture member - [ ] Layer textures vector - [ ] Pipeline and bind group members -- [ ] `src/gpu/effects/cnn_v2_effect.cc` - Implementation +- [ ] `src/effects/cnn_v2_effect.cc` - Implementation - [ ] Constructor: Load shaders, create textures - [ ] `init()`: Create pipelines, bind groups - [ ] `render()`: Multi-pass execution @@ -598,8 +598,8 @@ workspaces/main/shaders/cnn_v2/cnn_v2_layer_1.wgsl # Inner layer (generated workspaces/main/shaders/cnn_v2/cnn_v2_layer_2.wgsl # Output layer (generated) # C++ implementation -src/gpu/effects/cnn_v2_effect.h # Effect class header -src/gpu/effects/cnn_v2_effect.cc # Effect implementation +src/effects/cnn_v2_effect.h # Effect class header +src/effects/cnn_v2_effect.cc # Effect implementation # Python training/export training/train_cnn_v2.py # Training script @@ -630,7 +630,7 @@ TODO.md # Add CNN v2 task ``` training/train_cnn.py # Original training -src/gpu/effects/cnn_effect.* # Original effect +src/effects/cnn_effect.* # Original effect workspaces/main/shaders/cnn_*.wgsl # Original v1 shaders ``` @@ -750,7 +750,7 @@ See `doc/CNN_V2_BINARY_FORMAT.md` for proposed descriptor format. ## References -- **v1 Implementation:** `src/gpu/effects/cnn_effect.*` +- **v1 Implementation:** `src/effects/cnn_effect.*` - **Training Guide:** `doc/HOWTO.md` (CNN Training section) - **Test Tool:** `doc/CNN_TEST_TOOL.md` - **Shader System:** `doc/SEQUENCE.md` diff --git a/doc/CNN_V2_BINARY_FORMAT.md b/doc/CNN_V2_BINARY_FORMAT.md index f718960..59c859d 100644 --- a/doc/CNN_V2_BINARY_FORMAT.md +++ b/doc/CNN_V2_BINARY_FORMAT.md @@ -230,6 +230,6 @@ Benefits: ## Related Files - `training/export_cnn_v2_weights.py` - Binary export tool -- `src/gpu/effects/cnn_v2_effect.cc` - C++ loader +- `src/effects/cnn_v2_effect.cc` - C++ loader - `tools/cnn_v2_test/index.html` - WebGPU validator - `doc/CNN_V2.md` - Architecture design diff --git a/doc/EFFECT_WORKFLOW.md b/doc/EFFECT_WORKFLOW.md index e453b63..22b8dc9 100644 --- a/doc/EFFECT_WORKFLOW.md +++ b/doc/EFFECT_WORKFLOW.md @@ -19,8 +19,8 @@ Automated checklist for adding new visual effects to the demo. ### 1. Create Effect Files **Location:** -- Header: `src/gpu/effects/<effect_name>_effect.h` -- Implementation: `src/gpu/effects/<effect_name>_effect.cc` +- Header: `src/effects/<effect_name>_effect.h` +- Implementation: `src/effects/<effect_name>_effect.cc` - Shader: `workspaces/main/shaders/<effect_name>.wgsl` **Naming Convention:** @@ -69,7 +69,7 @@ SHADER_TUNNEL, NONE, shaders/tunnel.wgsl, "Tunnel effect shader" **File:** `CMakeLists.txt` -**Action:** Add `src/gpu/effects/<effect_name>_effect.cc` to **BOTH** GPU_SOURCES sections: +**Action:** Add `src/effects/<effect_name>_effect.cc` to **BOTH** GPU_SOURCES sections: - Headless mode section (around line 141-167) - Normal mode section (around line 171-197) @@ -78,14 +78,14 @@ SHADER_TUNNEL, NONE, shaders/tunnel.wgsl, "Tunnel effect shader" **Example:** ```cmake # In headless section (line ~152): - src/gpu/effects/solarize_effect.cc - src/gpu/effects/tunnel_effect.cc # <-- Add here - src/gpu/effects/chroma_aberration_effect.cc + src/effects/solarize_effect.cc + src/effects/tunnel_effect.cc # <-- Add here + src/effects/chroma_aberration_effect.cc # In normal section (line ~183): - src/gpu/effects/solarize_effect.cc - src/gpu/effects/tunnel_effect.cc # <-- Add here - src/gpu/effects/chroma_aberration_effect.cc + src/effects/solarize_effect.cc + src/effects/tunnel_effect.cc # <-- Add here + src/effects/chroma_aberration_effect.cc ``` ### 4. Include in demo_effects.h @@ -94,7 +94,7 @@ SHADER_TUNNEL, NONE, shaders/tunnel.wgsl, "Tunnel effect shader" **Action:** Add include directive: ```cpp -#include "gpu/effects/<effect_name>_effect.h" +#include "effects/<effect_name>_effect.h" ``` **Location:** Alphabetically with other effect includes @@ -241,4 +241,4 @@ cmake --build build -j4 - `tools/shadertoy/README.md` - ShaderToy conversion guide - `doc/SEQUENCE.md` - Timeline format documentation - `doc/CONTRIBUTING.md` - General contribution guidelines -- `src/gpu/effects/` - Existing effect examples +- `src/effects/` - Existing effect examples diff --git a/doc/RECIPE.md b/doc/RECIPE.md index d563027..f17afde 100644 --- a/doc/RECIPE.md +++ b/doc/RECIPE.md @@ -8,7 +8,7 @@ Use `ShaderComposer` to dynamically assemble shaders from snippets. **Pattern:** ```cpp -#include "gpu/effects/shader_composer.h" +#include "gpu/shader_composer.h" #include "generated/assets.h" // 1. Load base shader template from asset @@ -70,7 +70,7 @@ fn compute_color(uv: vec2<f32>) -> vec4<f32> { )"); ``` -**Example usage:** `src/gpu/effects/rotating_cube_effect.cc:72-75` +**Example usage:** `src/effects/rotating_cube_effect.cc:72-75` ## QuadEffect with Auxiliary Textures @@ -161,7 +161,7 @@ EFFECT + MyEffect 0.0 10.0 strength=0.5 speed=3.0 EFFECT = MyEffect 10.0 20.0 strength=2.0 # speed keeps previous value ``` -**Example:** `src/gpu/effects/flash_effect.cc`, `src/gpu/effects/chroma_aberration_effect.cc` +**Example:** `src/effects/flash_effect.cc`, `src/effects/chroma_aberration_effect.cc` ## Uniform Buffer Alignment diff --git a/doc/WORKSPACE_SYSTEM.md b/doc/WORKSPACE_SYSTEM.md index 9362da6..64ba120 100644 --- a/doc/WORKSPACE_SYSTEM.md +++ b/doc/WORKSPACE_SYSTEM.md @@ -557,7 +557,7 @@ endif() **Modified files:** - `CMakeLists.txt` - Workspace support - `tools/asset_packer.cc` - Multi-path resolution -- `src/gpu/effects/shader_composer.cc` - Multi-path includes +- `src/gpu/shader_composer.cc` - Multi-path includes - `README.md` - Workspace documentation - `doc/HOWTO.md` - Build commands - `doc/CONTRIBUTING.md` - Workspace guidelines |
