Raster Spike

.github/workflows/provide-shaders.yml

@@ -1,9 +1,6 @@
 name: "Provide Shaders"
 
 on:
-  push:
-    branches:
-      - master
   workflow_dispatch: {}
 
 jobs:

.nix/pkgs/graphite-raster-nodes-shaders.nix

@@ -17,7 +17,7 @@
   env = deps.rustGPU.env;
 
   buildPhase = ''
-    cargo build -r -p raster-nodes-shaders
+    cargo build -r -p raster-nodes-shaders --features compile
   '';
 
   installPhase = ''

.nix/pkgs/graphite.nix

@@ -97,7 +97,6 @@ deps.crane.lib.buildPackage (
     makeCacheWritable = true;
 
     env = {
-      RASTER_NODES_SHADER_PATH = self.packages.${system}.graphite-raster-nodes-shaders;
       GRAPHITE_GIT_COMMIT_HASH = self.rev or "unknown";
       GRAPHITE_GIT_COMMIT_DATE = self.lastModified or "unknown";
       CEF_PATH = "${self.packages.${system}.graphite-cef}/lib";

Cargo.toml

@@ -292,6 +292,6 @@ debug = true
 [patch.crates-io]
 rfd = { git = "https://github.com/timon-schelling/rfd.git", branch = "graphite" } # TODO: Remove this once https://github.com/PolyMeilex/rfd/pull/317 is merged and released
 # TODO: Remove these once the fork's fixes are upstreamed and released
-vello_gpu = { git = "https://github.com/Keavon/vello.git", rev = "7306bb4f206d956a8989173237c406b1d7798b35" }
-vello_common = { git = "https://github.com/Keavon/vello.git", rev = "7306bb4f206d956a8989173237c406b1d7798b35" }
-vello_gpu_shaders = { git = "https://github.com/Keavon/vello.git", rev = "7306bb4f206d956a8989173237c406b1d7798b35" }
+vello_gpu = { git = "https://github.com/Keavon/vello.git", rev = "d11b17aaf78e5c8c2439ad3074d8cffa618994c2" }
+vello_common = { git = "https://github.com/Keavon/vello.git", rev = "d11b17aaf78e5c8c2439ad3074d8cffa618994c2" }
+vello_gpu_shaders = { git = "https://github.com/Keavon/vello.git", rev = "d11b17aaf78e5c8c2439ad3074d8cffa618994c2" }

desktop/src/render/state.rs

@@ -21,7 +21,7 @@ pub(crate) struct RenderState {
 	ui_texture: Option<wgpu::Texture>,
 	bind_group: Option<wgpu::BindGroup>,
 	#[derivative(Debug = "ignore")]
-	overlays_scene: Option<VelloSceneBuilder>,
+	overlays_scene: Option<VelloSceneBuilder<'static>>,
 	#[derivative(Debug = "ignore")]
 	overlays_canvas: VelloCanvas,
 	surface_outdated: bool,
@@ -220,7 +220,7 @@ impl RenderState {
 		self.viewport_offset = offset;
 	}
 
-	pub(crate) fn set_overlays_scene(&mut self, scene: VelloSceneBuilder) {
+	pub(crate) fn set_overlays_scene(&mut self, scene: VelloSceneBuilder<'static>) {
 		self.surface_outdated = true;
 		self.overlays_scene = Some(scene);
 	}

desktop/wrapper/Cargo.toml

@@ -15,7 +15,7 @@ publish.workspace = true
 workspace = true
 
 [features]
-gpu = ["graphite-editor/gpu", "graphene-std/shader-nodes"]
+gpu = ["graphite-editor/gpu"]
 
 [dependencies]
 # Local dependencies

desktop/wrapper/src/messages.rs

@@ -43,7 +43,7 @@ pub enum DesktopFrontendMessage {
 	WindowUpdateDirectInput {
 		enabled: bool,
 	},
-	UpdateOverlays(wgpu_executor::VelloSceneBuilder),
+	UpdateOverlays(wgpu_executor::VelloSceneBuilder<'static>),
 	PersistenceWritePreferences {
 		preferences: Preferences,
 	},

editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs

@@ -3,7 +3,6 @@ use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::utility_types::wires::GraphWireStyle;
 use crate::messages::preferences::SelectionMode;
 use crate::messages::prelude::*;
-use graph_craft::application_io::EditorPreferences;
 
 #[derive(ExtractField)]
 pub struct PreferencesDialogMessageContext<'a> {
@@ -362,44 +361,10 @@ impl PreferencesDialogMessageHandler {
 		// =============
 		{
 			let is_desktop = cfg!(not(target_family = "wasm"));
-			let header = vec![TextLabel::new("Compatibility").italic(true).widget_instance()];
-
-			let render_tile_resolution_description = "
-				Maximum X or Y resolution per render tile. Larger tiles may improve performance but can cause flickering or missing content in complex artwork if set too high.\n\
-				\n\
-				*Default: 1280 px.*
-				"
-			.trim();
-			let render_tile_resolution_label = vec![
-				Separator::new(SeparatorStyle::Unrelated).widget_instance(),
-				Separator::new(SeparatorStyle::Unrelated).widget_instance(),
-				TextLabel::new("Render Tile Resolution")
-					.tooltip_label("Render Tile Resolution")
-					.tooltip_description(render_tile_resolution_description)
-					.widget_instance(),
-			];
-			let render_tile_resolution = vec![
-				Separator::new(SeparatorStyle::Unrelated).widget_instance(),
-				Separator::new(SeparatorStyle::Unrelated).widget_instance(),
-				NumberInput::new(Some(preferences.max_render_region_size as f64))
-					.tooltip_label("Render Tile Resolution")
-					.tooltip_description(render_tile_resolution_description)
-					.mode_range()
-					.int()
-					.min(256.)
-					.max(4096.)
-					.increment_step(256.)
-					.unit(" px")
-					.on_update(|number_input: &NumberInput| {
-						let size = number_input.value.unwrap_or(EditorPreferences::default().max_render_region_size as f64) as u32;
-						PreferencesMessage::MaxRenderRegionSize { size }.into()
-					})
-					.widget_instance(),
-			];
-
-			rows.extend_from_slice(&[header, render_tile_resolution_label, render_tile_resolution]);
-
 			if is_desktop {
+				let header = vec![TextLabel::new("Compatibility").italic(true).widget_instance()];
+				rows.push(header);
+
 				let ui_acceleration_description = "
 					Use the CPU to draw the Graphite user interface (areas outside of the canvas) instead of the GPU. This does not affect the rendering of artwork in the canvas, which remains hardware accelerated.\n\
 					\n\

editor/src/messages/frontend/frontend_message.rs

@@ -263,8 +263,11 @@ pub enum FrontendMessage {
 	UpdateRenderStatus {
 		status: RenderStatus,
 	},
+	/// Gives the frontend the canvas images it lacks, and names every canvas the latest render uses so it can drop the rest.
 	UpdateImageData {
 		image_data: Vec<RasterizedImage>,
+		#[serde(rename = "canvasIdsInUse")]
+		canvas_ids_in_use: Vec<u64>,
 	},
 	UpdateDocumentLayerDetails {
 		data: LayerPanelEntry,