From 0a052b8d77bf3eca09fb8d867e14110db5fecc81 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Sun, 7 Sep 2025 20:02:46 +0200 Subject: [PATCH] WIP shaders: fix vello with `Raster` --- node-graph/gsvg-renderer/src/renderer.rs | 4 ++-- node-graph/wgpu-executor/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node-graph/gsvg-renderer/src/renderer.rs b/node-graph/gsvg-renderer/src/renderer.rs index 3917a14c3c..c43ed49b52 100644 --- a/node-graph/gsvg-renderer/src/renderer.rs +++ b/node-graph/gsvg-renderer/src/renderer.rs @@ -153,7 +153,7 @@ impl Default for SvgRender { #[derive(Clone, Debug, Default)] pub struct RenderContext { #[cfg(feature = "vello")] - pub resource_overrides: Vec<(peniko::Image, wgpu::Texture)>, + pub resource_overrides: Vec<(peniko::Image, Raster)>, } /// Static state used whilst rendering @@ -1326,7 +1326,7 @@ impl Render for Table> { .with_extend(peniko::Extend::Repeat); let image_transform = transform * *row.transform * DAffine2::from_scale(1. / DVec2::new(image.width as f64, image.height as f64)); scene.draw_image(&image, kurbo::Affine::new(image_transform.to_cols_array())); - context.resource_overrides.push((image, row.element.data().clone())); + context.resource_overrides.push((image, row.element.clone())); if layer { scene.pop_layer() diff --git a/node-graph/wgpu-executor/src/lib.rs b/node-graph/wgpu-executor/src/lib.rs index 0b42dd631e..8351d6cb54 100644 --- a/node-graph/wgpu-executor/src/lib.rs +++ b/node-graph/wgpu-executor/src/lib.rs @@ -140,7 +140,7 @@ impl WgpuExecutor { let mut renderer = self.vello_renderer.lock().await; for (image, texture) in context.resource_overrides.iter() { let texture_view = wgpu::TexelCopyTextureInfoBase { - texture: texture.clone(), + texture: texture.texture.clone(), mip_level: 0, origin: Origin3d::ZERO, aspect: TextureAspect::All,