shader-rt: initial

Author: Firestar99

node-graph/gcore/src/raster_types.rs

@@ -137,7 +137,7 @@ mod gpu {
 
 	#[derive(Clone, Debug, PartialEq, Hash)]
 	pub struct GPU {
-		texture: wgpu::Texture,
+		pub texture: wgpu::Texture,
 	}
 
 	impl Sealed for Raster<GPU> {}

node-graph/graster-nodes/src/fullscreen_vertex.rs

@@ -0,0 +1,14 @@
+use glam::{Vec2, Vec4};
+use spirv_std::spirv;
+
+/// webgpu NDC is like OpenGL: (-1.0 .. 1.0, -1.0 .. 1.0, 0.0 .. 1.0)
+/// https://www.w3.org/TR/webgpu/#coordinate-systems
+const FULLSCREEN_VERTICES: [Vec2; 3] = [Vec2::new(-1., -1.), Vec2::new(-1., 3.), Vec2::new(3., -1.)];
+
+#[spirv(vertex)]
+pub fn fullscreen_vertex(#[spirv(vertex_index)] vertex_index: u32, #[spirv(position)] gl_position: &mut Vec4) {
+	// broken on edition 2024 branch
+	// let vertex = unsafe { *FULLSCREEN_VERTICES.index_unchecked(vertex_index as usize) };
+	let vertex = FULLSCREEN_VERTICES[vertex_index as usize];
+	*gl_position = Vec4::from((vertex, 0., 1.));
+}

node-graph/graster-nodes/src/lib.rs

@@ -6,6 +6,7 @@ pub mod adjustments;
 pub mod black_and_white;
 pub mod blending_nodes;
 pub mod cubic_spline;
+pub mod fullscreen_vertex;
 
 #[cfg(feature = "std")]
 pub mod curve;

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

@@ -39,7 +39,7 @@ pub(crate) struct ParsedNodeFn {
 	pub(crate) description: String,
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub(crate) struct NodeFnAttributes {
 	pub(crate) category: Option<LitStr>,
 	pub(crate) display_name: Option<LitStr>,
@@ -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/mod.rs

@@ -19,7 +19,7 @@ pub fn modify_cfg(attributes: &NodeFnAttributes) -> TokenStream {
 	}
 }
 
-#[derive(Debug, VariantNames)]
+#[derive(Debug, Clone, VariantNames)]
 pub(crate) enum ShaderNodeType {
 	PerPixelAdjust(PerPixelAdjust),
 }
@@ -36,6 +36,7 @@ impl Parse for ShaderNodeType {
 
 pub trait CodegenShaderEntryPoint {
 	fn codegen_shader_entry_point(&self, parsed: &ParsedNodeFn) -> syn::Result<TokenStream>;
+	fn codegen_gpu_node(&self, parsed: &ParsedNodeFn) -> syn::Result<TokenStream>;
 }
 
 impl CodegenShaderEntryPoint for ShaderNodeType {
@@ -48,4 +49,10 @@ impl CodegenShaderEntryPoint for ShaderNodeType {
 			ShaderNodeType::PerPixelAdjust(x) => x.codegen_shader_entry_point(parsed),
 		}
 	}
+
+	fn codegen_gpu_node(&self, parsed: &ParsedNodeFn) -> syn::Result<TokenStream> {
+		match self {
+			ShaderNodeType::PerPixelAdjust(x) => x.codegen_gpu_node(parsed),
+		}
+	}
 }

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

@@ -1,11 +1,13 @@
-use crate::parsing::{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};
 use quote::{ToTokens, format_ident, quote};
 use std::borrow::Cow;
 use syn::parse::{Parse, ParseStream};
+use syn::{Path, Type, TypePath};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct PerPixelAdjust {}
 
 impl Parse for PerPixelAdjust {
@@ -17,28 +19,31 @@ impl Parse for PerPixelAdjust {
 impl CodegenShaderEntryPoint for PerPixelAdjust {
 	fn codegen_shader_entry_point(&self, parsed: &ParsedNodeFn) -> syn::Result<TokenStream> {
 		let fn_name = &parsed.fn_name;
-		let gpu_mod = format_ident!("{}_gpu", parsed.fn_name);
+		let gpu_mod = format_ident!("{}_gpu_entry_point", parsed.fn_name);
 		let spirv_image_ty = quote!(Image2d);
 
 		// bindings for images start at 1
 		let mut binding_cnt = 0;
 		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<_>>>()?;
@@ -93,6 +98,52 @@ impl CodegenShaderEntryPoint for PerPixelAdjust {
 			}
 		})
 	}
+
+	fn codegen_gpu_node(&self, parsed: &ParsedNodeFn) -> syn::Result<TokenStream> {
+		let fn_name = format_ident!("{}_gpu", parsed.fn_name);
+		let struct_name = format_ident!("{}", fn_name.to_string().to_case(Case::Pascal));
+		let mod_name = fn_name.clone();
+
+		let fields = parsed
+			.fields
+			.iter()
+			.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! {};
+
+		crate::codegen::generate_node_code(&ParsedNodeFn {
+			vis: parsed.vis.clone(),
+			attributes: NodeFnAttributes {
+				shader_node: None,
+				..parsed.attributes.clone()
+			},
+			fn_name,
+			struct_name,
+			mod_name,
+			fn_generics: vec![],
+			where_clause: None,
+			input: Input {
+				pat_ident: parsed.input.pat_ident.clone(),
+				ty: Type::Path(TypePath {
+					path: Path::from(format_ident!("Ctx")),
+					qself: None,
+				}),
+				implementations: Default::default(),
+			},
+			output_type: parsed.output_type.clone(),
+			is_async: true,
+			fields,
+			body,
+			crate_name: parsed.crate_name.clone(),
+			description: "".to_string(),
+		})
+	}
 }
 
 struct Param<'a> {

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

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

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

@@ -0,0 +1,20 @@
+use crate::Context;
+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 struct ShaderRuntime {
+	context: Context,
+	per_pixel_adjust: PerPixelAdjustShaderRuntime,
+}
+
+impl ShaderRuntime {
+	pub fn new(context: &Context) -> Self {
+		Self {
+			context: context.clone(),
+			per_pixel_adjust: PerPixelAdjustShaderRuntime::new(),
+		}
+	}
+}