From de9bc553ed0e8bda42057ac441936c20a8185f60 Mon Sep 17 00:00:00 2001 From: skal Date: Sat, 21 Feb 2026 09:44:17 +0100 Subject: refactor(wgsl): Use vec*f alias for vector types Replaces all instances of `vec` with the more concise `vec*f` alias (e.g., `vec3f`) across all `.wgsl` shaders. This improves readability and aligns with common graphics programming conventions. Also adds a new coding style rule to `doc/CODING_STYLE.md` to enforce this standard going forward. Finally, this commit fixes a build error in `test_effect_base.cc` by replacing a call to the non-existent `wgpuDeviceTick` with `wgpuDevicePoll`, which resolves the test failure. --- cnn_v1/shaders/cnn_conv1x1.wgsl | 2 +- cnn_v1/shaders/cnn_conv3x3.wgsl | 2 +- cnn_v1/shaders/cnn_conv5x5.wgsl | 2 +- cnn_v1/shaders/cnn_layer.wgsl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cnn_v1/shaders') diff --git a/cnn_v1/shaders/cnn_conv1x1.wgsl b/cnn_v1/shaders/cnn_conv1x1.wgsl index f77cfa8..a6fb84a 100644 --- a/cnn_v1/shaders/cnn_conv1x1.wgsl +++ b/cnn_v1/shaders/cnn_conv1x1.wgsl @@ -45,7 +45,7 @@ fn cnn_conv1x1_7to4_src( let step = 1.0 / resolution; var original = (textureSample(tex, samp, uv) - 0.5) * 2.0; - let gray = dot(original.rgb, vec3(0.2126, 0.7152, 0.0722)); + let gray = dot(original.rgb, vec3f(0.2126, 0.7152, 0.0722)); let uv_norm = (uv - 0.5) * 2.0; let in1 = vec4(uv_norm, gray, 1.0); diff --git a/cnn_v1/shaders/cnn_conv3x3.wgsl b/cnn_v1/shaders/cnn_conv3x3.wgsl index f7d11b1..4fddd24 100644 --- a/cnn_v1/shaders/cnn_conv3x3.wgsl +++ b/cnn_v1/shaders/cnn_conv3x3.wgsl @@ -45,7 +45,7 @@ fn cnn_conv3x3_7to4_src( let step = 1.0 / resolution; let original = (textureSample(tex, samp, uv) - 0.5) * 2.0; - let gray = dot(original.rgb, vec3(0.2126, 0.7152, 0.0722)); + let gray = dot(original.rgb, vec3f(0.2126, 0.7152, 0.0722)); let uv_norm = (uv - 0.5) * 2.0; let in1 = vec4(uv_norm, gray, 1.0); diff --git a/cnn_v1/shaders/cnn_conv5x5.wgsl b/cnn_v1/shaders/cnn_conv5x5.wgsl index 9328d75..415938e 100644 --- a/cnn_v1/shaders/cnn_conv5x5.wgsl +++ b/cnn_v1/shaders/cnn_conv5x5.wgsl @@ -77,7 +77,7 @@ fn cnn_conv5x5_7to4_src( let step = 1.0 / resolution; let original = (textureSample(tex, samp, uv) - 0.5) * 2.0; - let gray = dot(original.rgb, vec3(0.2126, 0.7152, 0.0722)); + let gray = dot(original.rgb, vec3f(0.2126, 0.7152, 0.0722)); let uv_norm = (uv - 0.5) * 2.0; let in1 = vec4(uv_norm, gray, 1.0); diff --git a/cnn_v1/shaders/cnn_layer.wgsl b/cnn_v1/shaders/cnn_layer.wgsl index cbd1686..c35cb39 100644 --- a/cnn_v1/shaders/cnn_layer.wgsl +++ b/cnn_v1/shaders/cnn_layer.wgsl @@ -33,7 +33,7 @@ struct CNNLayerParams { let uv = (p.xy - 0.5) / (uniforms.resolution - 1.0); let original_raw = textureSample(original_input, smplr, uv); let original = (original_raw - 0.5) * 2.0; // Normalize to [-1,1] - let gray = (dot(original_raw.rgb, vec3(0.2126, 0.7152, 0.0722)) - 0.5) * 2.0; + let gray = (dot(original_raw.rgb, vec3f(0.2126, 0.7152, 0.0722)) - 0.5) * 2.0; var result = vec4(0.0); // Layer 0: 7→4 (RGBD output, normalizes [0,1] input) -- cgit v1.2.3