WIP5

Author: Firestar99

node-graph/node-macro/src/codegen.rs

@@ -295,7 +295,12 @@ pub(crate) fn generate_node_code(parsed: &ParsedNodeFn) -> syn::Result<TokenStre
 
 	let cfg = crate::shader_nodes::modify_cfg(&attributes);
 	let node_input_accessor = generate_node_input_references(parsed, fn_generics, &field_idents, &graphene_core, &identifier, &cfg);
-	let shader_entry_point = attributes.shader_node.as_ref().map(|n| n.codegen_shader_entry_point(parsed)).unwrap_or(Ok(TokenStream::new()))?;
+	let (shader_entry_point, shader_gpu_node) = attributes
+		.shader_node
+		.as_ref()
+		.map::<syn::Result<_>, _>(|n| Ok((n.codegen_shader_entry_point(parsed)?, n.codegen_gpu_node(parsed)?)))
+		.unwrap_or(Ok((TokenStream::new(), TokenStream::new())))?;
+
 	Ok(quote! {
 		/// Underlying implementation for [#struct_name]
 		#[inline]
@@ -386,6 +391,8 @@ pub(crate) fn generate_node_code(parsed: &ParsedNodeFn) -> syn::Result<TokenStre
 		}
 
 		#shader_entry_point
+
+		#shader_gpu_node
 	})
 }
 

node-graph/node-macro/src/parsing.rs

@@ -604,14 +604,14 @@ fn parse_field(pat_ident: PatIdent, ty: Type, attrs: &[Attribute]) -> syn::Resul
 				ty,
 				value_source,
 				implementations,
+				gpu_image,
 			}),
 			name,
 			description,
 			widget_override,
 			number_display_decimal_places,
 			number_step,
 			unit,
-			gpu_image,
 		})
 	}
 }

node-graph/node-macro/src/shader_nodes/per_pixel_adjust.rs

@@ -1,4 +1,4 @@
-use crate::parsing::{Input, NodeFnAttributes, ParsedField, ParsedNodeFn};
+use crate::parsing::{Input, NodeFnAttributes, ParsedField, ParsedFieldType, ParsedNodeFn, RegularParsedField};
 use crate::shader_nodes::CodegenShaderEntryPoint;
 use convert_case::{Case, Casing};
 use proc_macro2::{Ident, TokenStream};
@@ -27,20 +27,23 @@ impl CodegenShaderEntryPoint for PerPixelAdjust {
 		let params = parsed
 			.fields
 			.iter()
-			.map(|f| match f {
-				ParsedField::Node { pat_ident, .. } => Err(syn::Error::new_spanned(pat_ident, "PerPixelAdjust shader nodes cannot accept other nodes as generics")),
-				ParsedField::Regular { gpu_image: false, pat_ident, ty, .. } => Ok(Param {
-					ident: Cow::Borrowed(&pat_ident.ident),
-					ty: Cow::Owned(ty.to_token_stream()),
-					param_type: ParamType::Uniform,
-				}),
-				ParsedField::Regular { gpu_image: true, pat_ident, .. } => {
-					binding_cnt += 1;
-					Ok(Param {
-						ident: Cow::Owned(format_ident!("image_{}", &pat_ident.ident)),
-						ty: Cow::Borrowed(&spirv_image_ty),
-						param_type: ParamType::Image { binding: binding_cnt },
-					})
+			.map(|f| {
+				let ident = &f.pat_ident;
+				match &f.ty {
+					ParsedFieldType::Node { .. } => Err(syn::Error::new_spanned(ident, "PerPixelAdjust shader nodes cannot accept other nodes as generics")),
+					ParsedFieldType::Regular(RegularParsedField { gpu_image: false, ty, .. }) => Ok(Param {
+						ident: Cow::Borrowed(&ident.ident),
+						ty: Cow::Owned(ty.to_token_stream()),
+						param_type: ParamType::Uniform,
+					}),
+					ParsedFieldType::Regular(RegularParsedField { gpu_image: true, .. }) => {
+						binding_cnt += 1;
+						Ok(Param {
+							ident: Cow::Owned(format_ident!("image_{}", &ident.ident)),
+							ty: Cow::Borrowed(&spirv_image_ty),
+							param_type: ParamType::Image { binding: binding_cnt },
+						})
+					}
 				}
 			})
 			.collect::<syn::Result<Vec<_>>>()?;
@@ -104,13 +107,12 @@ impl CodegenShaderEntryPoint for PerPixelAdjust {
 		let fields = parsed
 			.fields
 			.iter()
-			.map(|f| match f {
-				ParsedField::Regular { .. } => {
-					let mut ret = f.clone();
-					ret.gpu_image = false;
-					Ok(ret)
-				}
-				ParsedField::Node { pat_ident, .. } => Err(syn::Error::new_spanned(pat_ident, "PerPixelAdjust shader nodes cannot accept other nodes as generics")),
+			.map(|f| match &f.ty {
+				ParsedFieldType::Regular(reg) => Ok(ParsedField {
+					ty: ParsedFieldType::Regular(RegularParsedField { gpu_image: false, ..reg.clone() }),
+					..f.clone()
+				}),
+				ParsedFieldType::Node { .. } => Err(syn::Error::new_spanned(&f.pat_ident, "PerPixelAdjust shader nodes cannot accept other nodes as generics")),
 			})
 			.collect::<syn::Result<_>>()?;
 		let body = quote! {};

node-graph/wgpu-executor/src/lib.rs

@@ -1,5 +1,5 @@
 mod context;
-mod shader_runtime;
+pub mod shader_runtime;
 pub mod texture_upload;
 
 use anyhow::Result;

node-graph/wgpu-executor/src/shader_runtime/per_pixel_adjust_runtime.rs

@@ -90,7 +90,7 @@ impl PerPixelAdjustGraphicsPipeline {
 
 	pub fn run(&self, context: &Context, input: Table<Raster<GPU>>) -> Table<Raster<GPU>> {
 		let device = &context.device;
-		let name = &self.name;
+		let name = self.name.as_str();
 
 		let mut cmd = device.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: Some("gpu_invert") });
 		let out = input
@@ -99,20 +99,19 @@ impl PerPixelAdjustGraphicsPipeline {
 				let tex_in = &instance.element.texture;
 				let view_in = tex_in.create_view(&TextureViewDescriptor::default());
 				let format = tex_in.format();
-				let pipeline = self.get(format);
 
 				let bind_group = device.create_bind_group(&BindGroupDescriptor {
-					label: Some(format!("{name} bind group")),
+					label: Some(&format!("{name} bind group")),
 					// `get_bind_group_layout` allocates unnecessary memory, we could create it manually to not do that
-					layout: &pipeline.get_bind_group_layout(0),
+					layout: &self.pipeline.get_bind_group_layout(0),
 					entries: &[BindGroupEntry {
 						binding: 0,
 						resource: BindingResource::TextureView(&view_in),
 					}],
 				});
 
 				let tex_out = device.create_texture(&TextureDescriptor {
-					label: Some(format!("{name} texture out")),
+					label: Some(&format!("{name} texture out")),
 					size: tex_in.size(),
 					mip_level_count: 1,
 					sample_count: 1,
@@ -124,7 +123,7 @@ impl PerPixelAdjustGraphicsPipeline {
 
 				let view_out = tex_out.create_view(&TextureViewDescriptor::default());
 				let mut rp = cmd.begin_render_pass(&RenderPassDescriptor {
-					label: Some(format!("{name} render pipeline")),
+					label: Some(&format!("{name} render pipeline")),
 					color_attachments: &[Some(RenderPassColorAttachment {
 						view: &view_out,
 						resolve_target: None,
@@ -138,7 +137,7 @@ impl PerPixelAdjustGraphicsPipeline {
 					timestamp_writes: None,
 					occlusion_query_set: None,
 				});
-				rp.set_pipeline(&pipeline);
+				rp.set_pipeline(&self.pipeline);
 				rp.set_bind_group(0, Some(&bind_group), &[]);
 				rp.draw(0..3, 0..1);