From 96b18d25521b9cb274b3992d2062cd4531698a03 Mon Sep 17 00:00:00 2001 From: Timon Date: Fri, 24 Apr 2026 16:46:16 +0000 Subject: [PATCH] Fix gpu nodes --- node-graph/libraries/wgpu-executor/src/shader_runtime/mod.rs | 2 +- .../src/shader_runtime/per_pixel_adjust_runtime.rs | 3 +-- node-graph/node-macro/src/shader_nodes/per_pixel_adjust.rs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/node-graph/libraries/wgpu-executor/src/shader_runtime/mod.rs b/node-graph/libraries/wgpu-executor/src/shader_runtime/mod.rs index 7260fa6e56..a32e17aabb 100644 --- a/node-graph/libraries/wgpu-executor/src/shader_runtime/mod.rs +++ b/node-graph/libraries/wgpu-executor/src/shader_runtime/mod.rs @@ -3,7 +3,7 @@ use crate::shader_runtime::per_pixel_adjust_runtime::PerPixelAdjustShaderRuntime pub mod per_pixel_adjust_runtime; -pub const FULLSCREEN_VERTEX_SHADER_NAME: &str = "fullscreen_vertexfullscreen_vertex"; +pub const FULLSCREEN_VERTEX_SHADER_NAME: &str = "fullscreen_vertex_fullscreen_vertex"; pub struct ShaderRuntime { context: WgpuContext, diff --git a/node-graph/libraries/wgpu-executor/src/shader_runtime/per_pixel_adjust_runtime.rs b/node-graph/libraries/wgpu-executor/src/shader_runtime/per_pixel_adjust_runtime.rs index d6fcf75d3b..a64c6fe8bb 100644 --- a/node-graph/libraries/wgpu-executor/src/shader_runtime/per_pixel_adjust_runtime.rs +++ b/node-graph/libraries/wgpu-executor/src/shader_runtime/per_pixel_adjust_runtime.rs @@ -70,8 +70,7 @@ impl PerPixelAdjustGraphicsPipeline { let fragment_name = &name; let fragment_name = &fragment_name[(fragment_name.find("::").unwrap() + 2)..]; - // TODO workaround to naga removing `:` - let fragment_name = fragment_name.replace(":", ""); + let fragment_name = fragment_name.replace("::", "_"); let shader_module = device.create_shader_module(ShaderModuleDescriptor { label: Some(&format!("PerPixelAdjust {name} wgsl shader")), source: ShaderSource::Wgsl(Cow::Borrowed(info.wgsl_shader)), diff --git a/node-graph/node-macro/src/shader_nodes/per_pixel_adjust.rs b/node-graph/node-macro/src/shader_nodes/per_pixel_adjust.rs index 35fff34d87..e058436e89 100644 --- a/node-graph/node-macro/src/shader_nodes/per_pixel_adjust.rs +++ b/node-graph/node-macro/src/shader_nodes/per_pixel_adjust.rs @@ -66,7 +66,7 @@ impl ShaderCodegen for PerPixelAdjust { } } - let entry_point_mod = format_ident!("{}_gpu_entry_point", fn_name); + let entry_point_mod = format_ident!("{}_gpu", fn_name); let entry_point_name_ident = format_ident!("ENTRY_POINT_NAME"); let entry_point_name = quote!(#entry_point_mod::#entry_point_name_ident); let uniform_struct_ident = format_ident!("Uniform");