diff --git a/node-graph/interpreted-executor/src/util.rs b/node-graph/interpreted-executor/src/util.rs index 13d2b19c83..670f00d397 100644 --- a/node-graph/interpreted-executor/src/util.rs +++ b/node-graph/interpreted-executor/src/util.rs @@ -73,7 +73,7 @@ pub fn wrap_network_in_scope(network: NodeNetwork, editor_api: Arc( ctx: impl Ctx + ExtractFootprint + ExtractVarArgs, - #[scope(composit_background_pipeline::IDENTIFIER)] pipeline: WgpuPipelineCache, + #[scope(composite_background_pipeline::IDENTIFIER)] pipeline: WgpuPipelineCache, data: RenderOutput, ) -> RenderOutput { let footprint = ctx.footprint(); @@ -36,7 +36,7 @@ async fn render_background<'a: 'n>( RenderOutputType::Texture(foreground_texture) => { let doc_to_screen = (glam::DAffine2::from_scale(glam::DVec2::splat(render_params.scale)) * render_params.footprint.transform).as_affine2(); let blended = pipeline - .run::(&CompositBackgroundArgs { + .run::(&CompositeBackgroundArgs { foreground: foreground_texture.as_ref(), backgrounds: &metadata.backgrounds, document_to_screen: doc_to_screen, @@ -118,18 +118,18 @@ async fn render_background<'a: 'n>( } #[node_macro::node(category(""), inject_scope)] -async fn composit_background_pipeline<'a: 'n>( +async fn composite_background_pipeline<'a: 'n>( _ctx: impl Ctx, #[scope(crate::platform_application_io::try_wgpu_executor::IDENTIFIER)] executor: Option<&'a WgpuExecutor>, #[data] pipeline: WgpuPipelineCache, ) -> WgpuPipelineCache { if let Some(executor) = executor { - executor.pipeline_init::(pipeline); + executor.pipeline_init::(pipeline); } pipeline.clone() } -pub struct CompositBackground { +pub struct CompositeBackground { checker_rect_pipeline: wgpu::RenderPipeline, checker_viewport_pipeline: wgpu::RenderPipeline, fullscreen_pipeline: wgpu::RenderPipeline, @@ -138,15 +138,15 @@ pub struct CompositBackground { sampler: wgpu::Sampler, } -pub struct CompositBackgroundArgs<'a> { +pub struct CompositeBackgroundArgs<'a> { foreground: &'a wgpu::Texture, backgrounds: &'a [rendering::Background], document_to_screen: Affine2, zoom: f32, } -impl AsyncWgpuPipeline for CompositBackground { - type Args<'a> = CompositBackgroundArgs<'a>; +impl AsyncWgpuPipeline for CompositeBackground { + type Args<'a> = CompositeBackgroundArgs<'a>; type Out = Arc; fn create(executor: &WgpuExecutor) -> Self { @@ -329,7 +329,7 @@ impl AsyncWgpuPipeline for CompositBackground { } async fn run<'a>(&'a self, executor: &'a WgpuExecutor, args: &'a Self::Args<'_>) -> Self::Out { - let &CompositBackgroundArgs { + let &CompositeBackgroundArgs { foreground, backgrounds, document_to_screen, @@ -439,7 +439,7 @@ impl AsyncWgpuPipeline for CompositBackground { } } -impl CompositBackground { +impl CompositeBackground { fn create_checker_bind_group(&self, device: &wgpu::Device, uniforms: CompositeUniforms) -> wgpu::BindGroup { let buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { label: Some("background_checker_uniforms"),