diff options
Diffstat (limited to '')
| -rw-r--r-- | widget/src/shader.rs | 11 | ||||
| -rw-r--r-- | widget/src/shader/program.rs | 4 | 
2 files changed, 8 insertions, 7 deletions
| diff --git a/widget/src/shader.rs b/widget/src/shader.rs index 68112f83..fad2f4eb 100644 --- a/widget/src/shader.rs +++ b/widget/src/shader.rs @@ -13,12 +13,13 @@ use crate::core::widget::tree::{self, Tree};  use crate::core::widget::{self, Widget};  use crate::core::window;  use crate::core::{Clipboard, Element, Length, Rectangle, Shell, Size}; -use crate::renderer::wgpu::primitive::pipeline; +use crate::renderer::wgpu::primitive;  use std::marker::PhantomData; +pub use crate::graphics::Viewport;  pub use crate::renderer::wgpu::wgpu; -pub use pipeline::{Primitive, Storage}; +pub use primitive::{Primitive, Storage};  /// A widget which can render custom shaders with Iced's `wgpu` backend.  /// @@ -60,7 +61,7 @@ impl<P, Message, Theme, Renderer> Widget<Message, Theme, Renderer>      for Shader<Message, P>  where      P: Program<Message>, -    Renderer: pipeline::Renderer, +    Renderer: primitive::Renderer,  {      fn tag(&self) -> tree::Tag {          struct Tag<T>(T); @@ -160,7 +161,7 @@ where          let bounds = layout.bounds();          let state = tree.state.downcast_ref::<P::State>(); -        renderer.draw_pipeline_primitive( +        renderer.draw_primitive(              bounds,              self.program.draw(state, cursor_position, bounds),          ); @@ -171,7 +172,7 @@ impl<'a, Message, Theme, Renderer, P> From<Shader<Message, P>>      for Element<'a, Message, Theme, Renderer>  where      Message: 'a, -    Renderer: pipeline::Renderer, +    Renderer: primitive::Renderer,      P: Program<Message> + 'a,  {      fn from( diff --git a/widget/src/shader/program.rs b/widget/src/shader/program.rs index 6dd50404..902c7c3b 100644 --- a/widget/src/shader/program.rs +++ b/widget/src/shader/program.rs @@ -1,7 +1,7 @@  use crate::core::event;  use crate::core::mouse;  use crate::core::{Rectangle, Shell}; -use crate::renderer::wgpu::primitive::pipeline; +use crate::renderer::wgpu::Primitive;  use crate::shader;  /// The state and logic of a [`Shader`] widget. @@ -15,7 +15,7 @@ pub trait Program<Message> {      type State: Default + 'static;      /// The type of primitive this [`Program`] can draw. -    type Primitive: pipeline::Primitive + 'static; +    type Primitive: Primitive + 'static;      /// Update the internal [`State`] of the [`Program`]. This can be used to reflect state changes      /// based on mouse & other events. You can use the [`Shell`] to publish messages, request a | 
