gcore: remove most #[cfg(target_arch = "spirv")], keep some potentially useful ones

Author: Firestar99

node-graph/gcore/src/logic.rs

@@ -4,7 +4,6 @@ use glam::{DAffine2, DVec2};
 
 #[node_macro::node(category("Debug"))]
 fn log_to_console<T: std::fmt::Debug>(_: impl Ctx, #[implementations(String, bool, f64, u32, u64, DVec2, VectorDataTable, DAffine2, Color, Option<Color>)] value: T) -> T {
-	#[cfg(not(target_arch = "spirv"))]
 	// KEEP THIS `debug!()` - It acts as the output for the debug node itself
 	log::debug!("{:#?}", value);
 	value

node-graph/gcore/src/ops.rs

@@ -14,9 +14,6 @@ use rand::{Rng, SeedableRng};
 use std::marker::PhantomData;
 use std::ops::{Add, Div, Mul, Rem, Sub};
 
-#[cfg(target_arch = "spirv")]
-use spirv_std::num_traits::float::Float;
-
 /// The struct that stores the context for the maths parser.
 /// This is currently just limited to supplying `a` and `b` until we add better node graph support and UI for variadic inputs.
 struct MathNodeContext {

node-graph/gcore/src/raster.rs

@@ -13,10 +13,8 @@ use spirv_std::num_traits::float::Float;
 
 pub mod adjustments;
 pub mod bbox;
-#[cfg(not(target_arch = "spirv"))]
 pub mod brush_cache;
 pub mod color;
-#[cfg(not(target_arch = "spirv"))]
 pub mod curve;
 pub mod discrete_srgb;
 

node-graph/gcore/src/raster/adjustments.rs

@@ -10,9 +10,6 @@ use crate::vector::style::GradientStops;
 use crate::{Ctx, Node};
 use crate::{GraphicElement, GraphicGroupTable};
 use dyn_any::DynAny;
-#[cfg(feature = "serde")]
-#[cfg(target_arch = "spirv")]
-use spirv_std::num_traits::float::Float;
 use std::cmp::Ordering;
 use std::fmt::Debug;
 

node-graph/gcore/src/raster/bbox.rs

@@ -1,8 +1,7 @@
 use dyn_any::DynAny;
 use glam::{DAffine2, DVec2};
 
-#[cfg_attr(not(target_arch = "spirv"), derive(Debug))]
-#[derive(Clone, DynAny)]
+#[derive(Clone, Debug, DynAny)]
 pub struct AxisAlignedBbox {
 	pub start: DVec2,
 	pub end: DVec2,
@@ -60,8 +59,7 @@ impl From<(DVec2, DVec2)> for AxisAlignedBbox {
 	}
 }
 
-#[cfg_attr(not(target_arch = "spirv"), derive(Debug))]
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Bbox {
 	pub top_left: DVec2,
 	pub top_right: DVec2,

node-graph/gcore/src/raster/color.rs

@@ -5,7 +5,6 @@ use dyn_any::DynAny;
 use half::f16;
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::Euclid;
-#[cfg(feature = "serde")]
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::float::Float;
 use std::hash::Hash;