Fix graph compile issues

Author: TrueDoctor

node-graph/gstd/src/wasm_application_io.rs

@@ -23,8 +23,8 @@ pub use graph_craft::wasm_application_io::*;
 pub struct CreateSurfaceNode {}
 
 #[node_macro::node_fn(CreateSurfaceNode)]
-async fn create_surface_node<'a: 'input>(editor: &'a WasmEditorApi) -> WasmSurfaceHandle {
-	editor.application_io.as_ref().unwrap().create_surface()
+async fn create_surface_node<'a: 'input>(editor: &'a WasmEditorApi) -> Arc<WasmSurfaceHandle> {
+	Arc::new(editor.application_io.as_ref().unwrap().create_surface())
 }
 
 #[cfg(target_arch = "wasm32")]
@@ -34,8 +34,14 @@ pub struct DrawImageFrameNode<Surface> {
 
 #[node_macro::node_fn(DrawImageFrameNode)]
 #[cfg(target_arch = "wasm32")]
-async fn draw_image_frame_node<'a: 'input>(image: ImageFrame<SRGBA8>, surface_handle: Arc<WasmSurfaceHandle>) -> SurfaceHandleFrame<HtmlCanvasElement> {
+async fn draw_image_frame_node<'a: 'input>(
+	image: ImageFrame<graphene_core::raster::SRGBA8>,
+	surface_handle: Arc<WasmSurfaceHandle>,
+) -> graphene_core::application_io::SurfaceHandleFrame<HtmlCanvasElement> {
+	use graphene_core::application_io::SurfaceHandleFrame;
+
 	let image_data = image.image.data;
+	use wasm_bindgen::Clamped;
 	let array: Clamped<&[u8]> = Clamped(bytemuck::cast_slice(image_data.as_slice()));
 	if image.image.width > 0 && image.image.height > 0 {
 		let canvas = &surface_handle.surface;

node-graph/interpreted-executor/src/node_registry.rs

@@ -350,7 +350,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Footprint, output: Artboard, fn_params: [Footprint => Artboard]),
 		async_node!(graphene_std::wasm_application_io::LoadResourceNode<_>, input: &WasmEditorApi, output: Arc<[u8]>, params: [String]),
 		register_node!(graphene_std::wasm_application_io::DecodeImageNode, input: Arc<[u8]>, params: []),
-		async_node!(graphene_std::wasm_application_io::CreateSurfaceNode, input: &WasmEditorApi, output: WasmSurfaceHandle, params: []),
+		async_node!(graphene_std::wasm_application_io::CreateSurfaceNode, input: &WasmEditorApi, output: Arc<WasmSurfaceHandle>, params: []),
 		#[cfg(target_arch = "wasm32")]
 		async_node!(
 			graphene_std::wasm_application_io::DrawImageFrameNode<_>,
@@ -615,7 +615,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: (), output: ShaderInputFrame, params: [ShaderInputFrame]),
 		#[cfg(feature = "gpu")]
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: (), output: wgpu_executor::WgpuSurface, params: [wgpu_executor::WgpuSurface]),
-		// async_node!(graphene_core::memo::MemoNode<_, _>, input: (), output: wgpu_executor::Surface, params: [wgpu_executor::Surface]),
+		async_node!(graphene_core::memo::MemoNode<_, _>, input: (), output: wgpu_executor::WindowHandle, params: [wgpu_executor::WindowHandle]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: (), output: SurfaceFrame, params: [SurfaceFrame]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: (), output: RenderOutput, params: [RenderOutput]),
 		async_node!(graphene_core::memo::ImpureMemoNode<_, _, _>, input: Footprint, output: GraphicGroup, fn_params: [Footprint => GraphicGroup]),

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

@@ -14,8 +14,6 @@ use graphene_core::application_io::{ApplicationIo, EditorApi, SurfaceHandle};
 use graphene_core::raster::color::RGBA16F;
 use graphene_core::raster::{Image, ImageFrame};
 use graphene_core::transform::{Footprint, Transform};
-#[cfg(target_arch = "wasm32")]
-use graphene_core::WasmSurfaceHandle;
 use graphene_core::{Color, Cow, Node, SurfaceFrame};
 
 use std::pin::Pin;
@@ -463,9 +461,9 @@ impl WgpuExecutor {
 	fn create_surface(&self, canvas: graphene_core::WasmSurfaceHandle) -> Result<SurfaceHandle<Surface>> {
 		let surface = self.context.instance.create_surface(wgpu::SurfaceTarget::Canvas(canvas.surface))?;
 
-		let surface_caps = surface.get_capabilities(&self.context.adapter);
-		let surface_format = wgpu::TextureFormat::Rgba16Float;
-		let config = wgpu::SurfaceConfiguration {
+		// let surface_caps = surface.get_capabilities(&self.context.adapter);
+		// let surface_format = wgpu::TextureFormat::Rgba16Float;
+		/*let config = wgpu::SurfaceConfiguration {
 			usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
 			format: surface_format,
 			width: 1920,
@@ -474,9 +472,9 @@ impl WgpuExecutor {
 			alpha_mode: surface_caps.alpha_modes[0],
 			view_formats: vec![],
 			desired_maximum_frame_latency: 2,
-		};
+		};*/
 		// surface.configure(&self.context.device, &config);
-		self.surface_config.set(Some(config));
+		// self.surface_config.set(Some(config));
 		Ok(SurfaceHandle {
 			surface_id: canvas.surface_id,
 			surface: Surface(surface),