Shaders: more graster-nodes no-std fixups (#3090)

* gcore-shaders: fix missing `num-traits/libm` features

* graster-nodes: fix missing cfg on use statements

* shaders: use unchecked Color constructors

* graster-nodes: remove async from shader nodes not needing it

* gcore-shaders: remove explicit fn pointer

* graster-nodes: make kurbo std-only

* graster-nodes: replace glam reexport with normal dep

* gcore: impl Display for ProtoNodeIdentifier

* unify glam workspace dep

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

@@ -7,10 +7,13 @@ use core::fmt::Debug;
 use graphene_core::gradient::GradientStops;
 #[cfg(feature = "std")]
 use graphene_core::raster_types::{CPU, Raster};
+#[cfg(feature = "std")]
 use graphene_core::table::Table;
 use graphene_core_shaders::color::Color;
 use graphene_core_shaders::context::Ctx;
 use graphene_core_shaders::registry::types::{Angle, Percentage, SignedPercentage};
+#[cfg(not(feature = "std"))]
+use num_traits::float::Float;
 
 // TODO: Implement the following:
 // Color Balance
@@ -125,7 +128,7 @@ fn make_opaque<T: Adjust<Color>>(
 		if color.a() == 0. {
 			return color.with_alpha(1.);
 		}
-		Color::from_rgbaf32(color.r() / color.a(), color.g() / color.a(), color.b() / color.a(), 1.).unwrap()
+		Color::from_rgbaf32_unchecked(color.r() / color.a(), color.g() / color.a(), color.b() / color.a(), 1.)
 	});
 	input
 }
@@ -295,7 +298,7 @@ fn levels<T: Adjust<Color>>(
 // https://stackoverflow.com/a/55233732/775283
 // Works the same for gamma and linear color
 #[node_macro::node(name("Black & White"), category("Raster: Adjustment"), shader_node(PerPixelAdjust))]
-async fn black_and_white<T: Adjust<Color>>(
+fn black_and_white<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -360,7 +363,7 @@ async fn black_and_white<T: Adjust<Color>>(
 		// TODO: Fix "Color" blend mode implementation so it matches the expected behavior perfectly (it's currently close)
 		let color = tint.with_luminance(luminance);
 
-		let color = Color::from_rgbaf32(color.r(), color.g(), color.b(), alpha_part).unwrap();
+		let color = Color::from_rgbaf32_unchecked(color.r(), color.g(), color.b(), alpha_part);
 
 		color.to_linear_srgb()
 	});
@@ -371,7 +374,7 @@ async fn black_and_white<T: Adjust<Color>>(
 // https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#:~:text=%27hue%20%27%20%3D%20Old,saturation%2C%20Photoshop%205.0
 // https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#:~:text=0%20%3D%20Use%20other.-,Hue/Saturation,-Hue/Saturation%20settings
 #[node_macro::node(name("Hue/Saturation"), category("Raster: Adjustment"), shader_node(PerPixelAdjust))]
-async fn hue_saturation<T: Adjust<Color>>(
+fn hue_saturation<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -406,7 +409,7 @@ async fn hue_saturation<T: Adjust<Color>>(
 // Aims for interoperable compatibility with:
 // https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#:~:text=%27%20%3D%20Color%20Lookup-,%27nvrt%27%20%3D%20Invert,-%27post%27%20%3D%20Posterize
 #[node_macro::node(category("Raster: Adjustment"), shader_node(PerPixelAdjust))]
-async fn invert<T: Adjust<Color>>(
+fn invert<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -429,7 +432,7 @@ async fn invert<T: Adjust<Color>>(
 // Aims for interoperable compatibility with:
 // https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#:~:text=post%27%20%3D%20Posterize-,%27thrs%27%20%3D%20Threshold,-%27grdm%27%20%3D%20Gradient
 #[node_macro::node(category("Raster: Adjustment"), shader_node(PerPixelAdjust))]
-async fn threshold<T: Adjust<Color>>(
+fn threshold<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -475,7 +478,7 @@ async fn threshold<T: Adjust<Color>>(
 // When both parameters are set, it is equivalent to running this adjustment twice, with only vibrance set and then only saturation set.
 // (Except for some noise probably due to rounding error.)
 #[node_macro::node(category("Raster: Adjustment"), shader_node(PerPixelAdjust))]
-async fn vibrance<T: Adjust<Color>>(
+fn vibrance<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -641,7 +644,7 @@ pub enum DomainWarpType {
 // https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#:~:text=%27mixr%27%20%3D%20Channel%20Mixer
 // https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#:~:text=Lab%20color%20only-,Channel%20Mixer,-Key%20is%20%27mixr
 #[node_macro::node(category("Raster: Adjustment"), properties("channel_mixer_properties"), shader_node(PerPixelAdjust))]
-async fn channel_mixer<T: Adjust<Color>>(
+fn channel_mixer<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -770,7 +773,7 @@ pub enum SelectiveColorChoice {
 // Algorithm based on:
 // https://blog.pkh.me/p/22-understanding-selective-coloring-in-adobe-photoshop.html
 #[node_macro::node(category("Raster: Adjustment"), properties("selective_color_properties"), shader_node(PerPixelAdjust))]
-async fn selective_color<T: Adjust<Color>>(
+fn selective_color<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -913,7 +916,7 @@ async fn selective_color<T: Adjust<Color>>(
 // https://www.axiomx.com/posterize.htm
 // This algorithm produces fully accurate output in relation to the industry standard.
 #[node_macro::node(category("Raster: Adjustment"), shader_node(PerPixelAdjust))]
-async fn posterize<T: Adjust<Color>>(
+fn posterize<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,
@@ -947,7 +950,7 @@ async fn posterize<T: Adjust<Color>>(
 // Algorithm based on:
 // https://geraldbakker.nl/psnumbers/exposure.html
 #[node_macro::node(category("Raster: Adjustment"), properties("exposure_properties"), shader_node(PerPixelAdjust))]
-async fn exposure<T: Adjust<Color>>(
+fn exposure<T: Adjust<Color>>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,

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

@@ -3,6 +3,7 @@ use crate::adjust::Adjust;
 use graphene_core::gradient::GradientStops;
 #[cfg(feature = "std")]
 use graphene_core::raster_types::{CPU, Raster};
+#[cfg(feature = "std")]
 use graphene_core::table::Table;
 use graphene_core_shaders::Ctx;
 use graphene_core_shaders::blending::BlendMode;
@@ -132,7 +133,7 @@ pub fn apply_blend_mode(foreground: Color, background: Color, blend_mode: BlendM
 }
 
 #[node_macro::node(category("Raster"), shader_node(PerPixelAdjust))]
-async fn blend<T: Blend<Color> + Send>(
+fn blend<T: Blend<Color> + Send>(
 	_: impl Ctx,
 	#[implementations(
 		Table<Raster<CPU>>,

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

@@ -1,8 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
-pub use graphene_core_shaders::glam;
-
 pub mod adjust;
 pub mod adjustments;
 pub mod blending_nodes;