Replace borrowed scope injections with arcs

node-graph/libraries/core-types/src/gnode.rs

@@ -31,7 +31,7 @@ pub trait GNode<Input> {
 		GPoll::Final(Extent::Free)
 	}
 
-	/// Introspection access to node-resident records, for example the monitor's captured io; `None` for ordinary nodes.
+	/// Introspection access to node-resident records; `None` for ordinary nodes.
 	fn serialize(&self) -> Option<std::sync::Arc<dyn std::any::Any + Send + Sync>> {
 		None
 	}

node-graph/libraries/core-types/src/ops.rs

@@ -47,9 +47,7 @@ pub trait Convert<T, C>: Sized {
 	fn convert(self, footprint: Footprint, converter: C) -> T;
 }
 
-/// The genuinely asynchronous counterpart of [`Convert`], for conversions whose work completes outside
-/// the evaluation, such as the GPU-to-CPU texture readback. Consumed by the `convert_async` kernel on
-/// the async source tier; a conversion pair implements exactly one of the two traits.
+/// The asynchronous counterpart of [`Convert`]; a conversion pair implements exactly one of the two traits.
 pub trait ConvertAsync<T, C>: Sized {
 	#[must_use]
 	fn convert(self, footprint: Footprint, converter: C) -> crate::runtime::SourceFuture<T>;

node-graph/libraries/core-types/src/registry.rs

@@ -180,8 +180,7 @@ impl std::fmt::Debug for EdgeHandle {
 	}
 }
 
-// SAFETY: wasm is single threaded, so the marker-free payload never actually crosses a thread;
-// mirrors the old NodeContainer assertion that let the executor live in a sync static.
+// SAFETY: wasm is single threaded, so the marker-free payload never actually crosses a thread.
 #[cfg(target_family = "wasm")]
 unsafe impl Send for EdgeHandle {}
 // SAFETY: as in Send.

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

@@ -60,6 +60,18 @@ impl std::fmt::Debug for WgpuExecutor {
 	}
 }
 
+/// Owned Arc handle carrying the executor as an ordinary wire value.
+#[derive(Clone, Debug)]
+pub struct WgpuExecutorHandle(pub std::sync::Arc<WgpuExecutor>);
+
+impl std::ops::Deref for WgpuExecutorHandle {
+	type Target = WgpuExecutor;
+
+	fn deref(&self) -> &WgpuExecutor {
+		&self.0
+	}
+}
+
 impl<'a, T: ApplicationIo<Executor = WgpuExecutor>> From<&'a EditorApi<T>> for &'a WgpuExecutor {
 	fn from(editor_api: &'a EditorApi<T>) -> Self {
 		editor_api.application_io.as_ref().unwrap().gpu_executor().unwrap()

node-graph/libraries/wgpu-executor/src/texture_conversion.rs

@@ -8,6 +8,7 @@ use core_types::runtime::SourceFuture;
 use core_types::transform::Footprint;
 use raster_types::Image;
 use raster_types::{CPU, GPU, Raster};
+use crate::WgpuExecutorHandle;
 use wgpu::util::{DeviceExt, TextureDataOrder};
 use wgpu::{Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages};
 
@@ -41,15 +42,15 @@ fn upload_to_texture(device: &wgpu::Device, queue: &wgpu::Queue, image: &Raster<
 
 
 /// Passthrough conversion for GPU `List`s - no conversion needed
-impl<'i> Convert<List<Raster<GPU>>, &'i WgpuExecutor> for List<Raster<GPU>> {
-	fn convert(self, _: Footprint, _converter: &'i WgpuExecutor) -> List<Raster<GPU>> {
+impl Convert<List<Raster<GPU>>, WgpuExecutorHandle> for List<Raster<GPU>> {
+	fn convert(self, _: Footprint, _converter: WgpuExecutorHandle) -> List<Raster<GPU>> {
 		self
 	}
 }
 
 /// Converts a `List<Raster<CPU>>` to `List<Raster<GPU>>` by uploading each image to a texture
-impl<'i> Convert<List<Raster<GPU>>, &'i WgpuExecutor> for List<Raster<CPU>> {
-	fn convert(self, _: Footprint, executor: &'i WgpuExecutor) -> List<Raster<GPU>> {
+impl Convert<List<Raster<GPU>>, WgpuExecutorHandle> for List<Raster<CPU>> {
+	fn convert(self, _: Footprint, executor: WgpuExecutorHandle) -> List<Raster<GPU>> {
 		let device = &executor.context().device;
 		let queue = executor.context().queue.lock();
 		let list = self
@@ -68,8 +69,8 @@ impl<'i> Convert<List<Raster<GPU>>, &'i WgpuExecutor> for List<Raster<CPU>> {
 }
 
 /// Converts single CPU raster to GPU by uploading to texture
-impl<'i> Convert<Raster<GPU>, &'i WgpuExecutor> for Raster<CPU> {
-	fn convert(self, _: Footprint, executor: &'i WgpuExecutor) -> Raster<GPU> {
+impl Convert<Raster<GPU>, WgpuExecutorHandle> for Raster<CPU> {
+	fn convert(self, _: Footprint, executor: WgpuExecutorHandle) -> Raster<GPU> {
 		let device = &executor.context().device;
 		let queue = executor.context().queue.lock();
 		let texture = upload_to_texture(device, &queue, &self);
@@ -80,8 +81,8 @@ impl<'i> Convert<Raster<GPU>, &'i WgpuExecutor> for Raster<CPU> {
 }
 
 /// Passthrough conversion for CPU `List`s - no conversion needed
-impl<'i> Convert<List<Raster<CPU>>, &'i WgpuExecutor> for List<Raster<CPU>> {
-	fn convert(self, _: Footprint, _converter: &'i WgpuExecutor) -> List<Raster<CPU>> {
+impl Convert<List<Raster<CPU>>, WgpuExecutorHandle> for List<Raster<CPU>> {
+	fn convert(self, _: Footprint, _converter: WgpuExecutorHandle) -> List<Raster<CPU>> {
 		self
 	}
 }
@@ -191,8 +192,8 @@ impl RasterGpuToRasterCpuConverter {
 }
 
 /// Converts a `List<Raster<GPU>>` to `List<Raster<CPU>>` by downloading texture data in one go then asynchronously maps all buffers and processes the results.
-impl<'i> ConvertAsync<List<Raster<CPU>>, &'i WgpuExecutor> for List<Raster<GPU>> {
-	fn convert(self, _: Footprint, executor: &'i WgpuExecutor) -> SourceFuture<List<Raster<CPU>>> {
+impl ConvertAsync<List<Raster<CPU>>, WgpuExecutorHandle> for List<Raster<GPU>> {
+	fn convert(self, _: Footprint, executor: WgpuExecutorHandle) -> SourceFuture<List<Raster<CPU>>> {
 		let device = executor.context().device.clone();
 		let queue = executor.context().queue.lock();
 
@@ -235,8 +236,8 @@ impl<'i> ConvertAsync<List<Raster<CPU>>, &'i WgpuExecutor> for List<Raster<GPU>>
 }
 
 /// Converts single GPU raster to CPU by downloading texture data
-impl<'i> ConvertAsync<Raster<CPU>, &'i WgpuExecutor> for Raster<GPU> {
-	fn convert(self, _: Footprint, executor: &'i WgpuExecutor) -> SourceFuture<Raster<CPU>> {
+impl ConvertAsync<Raster<CPU>, WgpuExecutorHandle> for Raster<GPU> {
+	fn convert(self, _: Footprint, executor: WgpuExecutorHandle) -> SourceFuture<Raster<CPU>> {
 		let device = executor.context().device.clone();
 		let queue = executor.context().queue.lock();
 
@@ -256,10 +257,10 @@ impl<'i> ConvertAsync<Raster<CPU>, &'i WgpuExecutor> for Raster<GPU> {
 ///
 /// Accepts either individual raster data or a `List` of raster elements and converts it to the GPU format using the WgpuExecutor's device and queue.
 #[node_macro::node(category(""))]
-pub fn upload_texture<'a, T: Convert<List<Raster<GPU>>, &'a WgpuExecutor>>(
+pub fn upload_texture<T: Convert<List<Raster<GPU>>, WgpuExecutorHandle>>(
 	_: impl Ctx,
 	#[implementations(List<Raster<CPU>>, List<Raster<GPU>>)] input: T,
-	executor: &'a WgpuExecutor,
+	executor: WgpuExecutorHandle,
 ) -> List<Raster<GPU>> {
 	input.convert(Footprint::DEFAULT, executor)
 }