Shaders: add gcore-shaders and make graster-nodes no-std (#2925)

* gcore-shaders: add crate, move `color` and `blending` from gcore

* gcore-shaders: move `AsU32`

* gcore-shaders: move `ChoiceType`, switch `Cow` for `&str`, adjust node macro

* gcore-shaders: move `registry::types`

* gcore-shaders: move `context::Ctx`

* raster-nodes: make it `no_std` with `std` feature

* gcore-shaders: fix doctest

Author: Firestar99

Cargo.lock

@@ -7,6 +7,7 @@ members = [
 	"node-graph/gapplication-io",
 	"node-graph/gbrush",
 	"node-graph/gcore",
+	"node-graph/gcore-shaders",
 	"node-graph/gstd",
 	"node-graph/gmath-nodes",
 	"node-graph/gpath-bool",
@@ -28,6 +29,7 @@ default-members = [
 	"frontend/wasm",
 	"node-graph/gbrush",
 	"node-graph/gcore",
+	"node-graph/gcore-shaders",
 	"node-graph/gstd",
 	"node-graph/gmath-nodes",
 	"node-graph/gpath-bool",
@@ -50,6 +52,7 @@ path-bool = { path = "libraries/path-bool" }
 graphene-application-io = { path = "node-graph/gapplication-io" }
 graphene-brush = { path = "node-graph/gbrush" }
 graphene-core = { path = "node-graph/gcore" }
+graphene-core-shaders = { path = "node-graph/gcore-shaders" }
 graphene-math-nodes = { path = "node-graph/gmath-nodes" }
 graphene-path-bool = { path = "node-graph/gpath-bool" }
 graph-craft = { path = "node-graph/graph-craft" }
@@ -166,6 +169,7 @@ opt-level = 1
 
 [profile.dev.package]
 graphite-editor = { opt-level = 1 }
+graphene-core-shaders = { opt-level = 1 }
 graphene-core = { opt-level = 1 }
 graphene-std = { opt-level = 1 }
 interpreted-executor = { opt-level = 1 } # This is a mitigation for https://github.com/rustwasm/wasm-pack/issues/981 which is needed because the node_registry function is too large

Cargo.toml

@@ -1938,7 +1938,7 @@ pub mod choice {
 	use super::ParameterWidgetsInfo;
 	use crate::messages::tool::tool_messages::tool_prelude::*;
 	use graph_craft::document::value::TaggedValue;
-	use graphene_std::registry::{ChoiceTypeStatic, ChoiceWidgetHint};
+	use graphene_std::choice_type::{ChoiceTypeStatic, ChoiceWidgetHint};
 	use std::marker::PhantomData;
 
 	pub trait WidgetFactory {
@@ -1998,10 +1998,7 @@ pub mod choice {
 						.map(|(item, metadata)| {
 							let updater = updater_factory();
 							let committer = committer_factory();
-							MenuListEntry::new(metadata.name.as_ref())
-								.label(metadata.label.as_ref())
-								.on_update(move |_| updater(item))
-								.on_commit(committer)
+							MenuListEntry::new(metadata.name).label(metadata.label).on_update(move |_| updater(item)).on_commit(committer)
 						})
 						.collect()
 				})
@@ -2020,11 +2017,11 @@ pub mod choice {
 				.map(|(item, var_meta)| {
 					let updater = updater_factory();
 					let committer = committer_factory();
-					let entry = RadioEntryData::new(var_meta.name.as_ref()).on_update(move |_| updater(item)).on_commit(committer);
+					let entry = RadioEntryData::new(var_meta.name).on_update(move |_| updater(item)).on_commit(committer);
 					match (var_meta.icon.as_deref(), var_meta.docstring.as_deref()) {
-						(None, None) => entry.label(var_meta.label.as_ref()),
-						(None, Some(doc)) => entry.label(var_meta.label.as_ref()).tooltip(doc),
-						(Some(icon), None) => entry.icon(icon).tooltip(var_meta.label.as_ref()),
+						(None, None) => entry.label(var_meta.label),
+						(None, Some(doc)) => entry.label(var_meta.label).tooltip(doc),
+						(Some(icon), None) => entry.icon(icon).tooltip(var_meta.label),
 						(Some(icon), Some(doc)) => entry.icon(icon).tooltip(format!("{}\n\n{}", var_meta.label, doc)),
 					}
 				})

editor/src/messages/portfolio/document/node_graph/node_properties.rs

@@ -419,7 +419,7 @@ impl LayoutHolder for MenuBarMessageHandler {
 							action: MenuBarEntry::no_action(),
 							disabled: no_active_document || !has_selected_layers,
 							children: MenuBarEntryChildren(vec![{
-								let list = <BooleanOperation as graphene_std::registry::ChoiceTypeStatic>::list();
+								let list = <BooleanOperation as graphene_std::choice_type::ChoiceTypeStatic>::list();
 								list.iter()
 									.flat_map(|i| i.iter())
 									.map(move |(operation, info)| MenuBarEntry {

editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs

@@ -187,7 +187,7 @@ impl SelectTool {
 	}
 
 	fn boolean_widgets(&self, selected_count: usize) -> impl Iterator<Item = WidgetHolder> + use<> {
-		let list = <BooleanOperation as graphene_std::registry::ChoiceTypeStatic>::list();
+		let list = <BooleanOperation as graphene_std::choice_type::ChoiceTypeStatic>::list();
 		list.iter().flat_map(|i| i.iter()).map(move |(operation, info)| {
 			let mut tooltip = info.label.to_string();
 			if let Some(doc) = info.docstring.as_deref() {

editor/src/messages/tool/tool_messages/select_tool.rs

@@ -0,0 +1,35 @@
+[package]
+name = "graphene-core-shaders"
+version = "0.1.0"
+edition = "2024"
+description = "no_std API definitions for Graphene"
+authors = ["Graphite Authors <contact@graphite.rs>"]
+license = "MIT OR Apache-2.0"
+
+[features]
+std = ["dep:dyn-any", "dep:serde", "dep:specta", "dep:log"]
+
+[dependencies]
+# Local std dependencies
+dyn-any = { workspace = true, optional = true }
+
+# Workspace dependencies
+bytemuck = { workspace = true }
+glam = { version = "0.29", default-features = false, features = ["nostd-libm", "scalar-math"] }
+half = { workspace = true }
+num-derive = { workspace = true }
+num-traits = { workspace = true }
+
+# Workspace std dependencies
+serde = { workspace = true, optional = true }
+specta = { workspace = true, optional = true }
+log = { workspace = true, optional = true }
+
+[dev-dependencies]
+graphene-core = { workspace = true }
+
+[lints.rust]
+# the spirv target is not in the list of common cfgs so must be added manually
+unexpected_cfgs = { level = "warn", check-cfg = [
+	'cfg(target_arch, values("spirv"))',
+] }

node-graph/gcore-shaders/Cargo.toml

@@ -1,8 +1,9 @@
-use dyn_any::DynAny;
-use std::hash::Hash;
+use core::fmt::Display;
+use core::hash::{Hash, Hasher};
 
-#[derive(Copy, Clone, Debug, PartialEq, DynAny, specta::Type, serde::Serialize, serde::Deserialize)]
-#[serde(default)]
+#[derive(Debug, Clone, Copy, PartialEq)]
+#[cfg_attr(feature = "std", derive(dyn_any::DynAny, specta::Type, serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "std", serde(default))]
 pub struct AlphaBlending {
 	pub blend_mode: BlendMode,
 	pub opacity: f32,
@@ -15,14 +16,14 @@ impl Default for AlphaBlending {
 	}
 }
 impl Hash for AlphaBlending {
-	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+	fn hash<H: Hasher>(&self, state: &mut H) {
 		self.opacity.to_bits().hash(state);
 		self.fill.to_bits().hash(state);
 		self.blend_mode.hash(state);
 		self.clip.hash(state);
 	}
 }
-impl std::fmt::Display for AlphaBlending {
+impl Display for AlphaBlending {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		let round = |x: f32| (x * 1e3).round() / 1e3;
 		write!(
@@ -62,9 +63,9 @@ impl AlphaBlending {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Default, Clone, Copy, Eq, PartialEq, DynAny, Hash, specta::Type)]
 #[repr(i32)]
+#[derive(Debug, Default, Clone, Copy, Eq, PartialEq, Hash)]
+#[cfg_attr(feature = "std", derive(dyn_any::DynAny, specta::Type, serde::Serialize, serde::Deserialize))]
 pub enum BlendMode {
 	// Basic group
 	#[default]
@@ -189,18 +190,19 @@ impl BlendMode {
 	}
 
 	/// Renders the blend mode CSS style declaration.
+	#[cfg(feature = "std")]
 	pub fn render(&self) -> String {
 		format!(
 			r#" mix-blend-mode: {};"#,
 			self.to_svg_style_name().unwrap_or_else(|| {
-				warn!("Unsupported blend mode {self:?}");
+				log::warn!("Unsupported blend mode {self:?}");
 				"normal"
 			})
 		)
 	}
 }
 
-impl std::fmt::Display for BlendMode {
+impl Display for BlendMode {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
 			// Normal group

node-graph/gcore/src/blending.rs node-graph/gcore-shaders/src/blending.rsnode-graph/gcore/src/blending.rs renamed to node-graph/gcore-shaders/src/blending.rs

@@ -0,0 +1,26 @@
+pub trait ChoiceTypeStatic: Sized + Copy + crate::AsU32 + Send + Sync {
+	const WIDGET_HINT: ChoiceWidgetHint;
+	const DESCRIPTION: Option<&'static str>;
+	fn list() -> &'static [&'static [(Self, VariantMetadata)]];
+}
+
+pub enum ChoiceWidgetHint {
+	Dropdown,
+	RadioButtons,
+}
+
+/// Translation struct between macro and definition.
+#[derive(Clone, Debug)]
+pub struct VariantMetadata {
+	/// Name as declared in source code.
+	pub name: &'static str,
+
+	/// Name to be displayed in UI.
+	pub label: &'static str,
+
+	/// User-facing documentation text.
+	pub docstring: Option<&'static str>,
+
+	/// Name of icon to display in radio buttons and such.
+	pub icon: Option<&'static str>,
+}

node-graph/gcore-shaders/src/choice_type.rs

@@ -1,16 +1,16 @@
 use super::color_traits::{Alpha, AlphaMut, AssociatedAlpha, Luminance, LuminanceMut, Pixel, RGB, RGBMut, Rec709Primaries, SRGB};
 use super::discrete_srgb::{float_to_srgb_u8, srgb_u8_to_float};
 use bytemuck::{Pod, Zeroable};
-use dyn_any::DynAny;
+use core::hash::Hash;
 use half::f16;
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::Euclid;
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::float::Float;
-use std::hash::Hash;
 
 #[repr(C)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, DynAny, Pod, Zeroable, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Pod, Zeroable)]
+#[cfg_attr(feature = "std", derive(dyn_any::DynAny, serde::Serialize, serde::Deserialize))]
 pub struct RGBA16F {
 	red: f16,
 	green: f16,
@@ -82,7 +82,8 @@ impl Alpha for RGBA16F {
 impl Pixel for RGBA16F {}
 
 #[repr(C)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, DynAny, Pod, Zeroable, specta::Type, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Pod, Zeroable)]
+#[cfg_attr(feature = "std", derive(dyn_any::DynAny, specta::Type, serde::Serialize, serde::Deserialize))]
 pub struct SRGBA8 {
 	red: u8,
 	green: u8,
@@ -162,7 +163,8 @@ impl Alpha for SRGBA8 {
 impl Pixel for SRGBA8 {}
 
 #[repr(C)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, DynAny, Pod, Zeroable, specta::Type, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Pod, Zeroable)]
+#[cfg_attr(feature = "std", derive(dyn_any::DynAny, specta::Type, serde::Serialize, serde::Deserialize))]
 pub struct Luma(pub f32);
 
 impl Luminance for Luma {
@@ -202,7 +204,8 @@ impl Pixel for Luma {}
 /// The other components (RGB) are stored as `f32` that range from `0.0` up to `f32::MAX`,
 /// the values encode the brightness of each channel proportional to the light intensity in cd/m² (nits) in HDR, and `0.0` (black) to `1.0` (white) in SDR color.
 #[repr(C)]
-#[derive(Debug, Default, Clone, Copy, PartialEq, DynAny, Pod, Zeroable, specta::Type, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Pod, Zeroable)]
+#[cfg_attr(feature = "std", derive(dyn_any::DynAny, specta::Type, serde::Serialize, serde::Deserialize))]
 pub struct Color {
 	red: f32,
 	green: f32,

node-graph/gcore/src/color/color.rs …e-graph/gcore-shaders/src/color/color.rsnode-graph/gcore/src/color/color.rs renamed to node-graph/gcore-shaders/src/color/color.rs node-graph/gcore/src/color/color.rs renamed to node-graph/gcore-shaders/src/color/color.rs

@@ -1,11 +1,10 @@
+pub use crate::blending::*;
 use bytemuck::{Pod, Zeroable};
+use core::fmt::Debug;
 use glam::DVec2;
-use std::fmt::Debug;
-
+use num_derive::*;
 #[cfg(target_arch = "spirv")]
-use spirv_std::num_traits::float::Float;
-
-pub use crate::blending::*;
+use num_traits::float::Float;
 
 pub trait Linear {
 	fn from_f32(x: f32) -> Self;
@@ -64,7 +63,6 @@ impl<T: Linear + Debug + Copy> Channel for T {
 
 impl<T: Linear + Debug + Copy> LinearChannel for T {}
 
-use num_derive::*;
 #[derive(Copy, Clone, Debug, PartialEq, PartialOrd, Num, NumCast, NumOps, One, Zero, ToPrimitive, FromPrimitive)]
 pub struct SRGBGammaFloat(f32);
 
@@ -97,14 +95,6 @@ impl<T: Rec709Primaries> RGBPrimaries for T {
 
 pub trait SRGB: Rec709Primaries {}
 
-pub trait Serde: serde::Serialize + for<'a> serde::Deserialize<'a> {}
-#[cfg(not(feature = "serde"))]
-pub trait Serde {}
-
-impl<T: serde::Serialize + for<'a> serde::Deserialize<'a>> Serde for T {}
-#[cfg(not(feature = "serde"))]
-impl<T> Serde for T {}
-
 // TODO: Come up with a better name for this trait
 pub trait Pixel: Clone + Pod + Zeroable + Default {
 	#[cfg(not(target_arch = "spirv"))]