diff options
| -rw-r--r-- | benches/wgpu.rs | 11 | ||||
| -rw-r--r-- | examples/integration/src/main.rs | 7 | ||||
| -rw-r--r-- | wgpu/src/lib.rs | 10 | ||||
| -rw-r--r-- | wgpu/src/window/compositor.rs | 6 |
4 files changed, 17 insertions, 17 deletions
diff --git a/benches/wgpu.rs b/benches/wgpu.rs index 780c6bc2..61b4eb6c 100644 --- a/benches/wgpu.rs +++ b/benches/wgpu.rs @@ -63,16 +63,7 @@ fn benchmark( Some(Antialiasing::MSAAx4), ); - let mut renderer = Renderer::new( - iced_wgpu::Settings { - present_mode: wgpu::PresentMode::Immediate, - backends: wgpu::Backends::all(), - default_font: Font::DEFAULT, - default_text_size: Pixels::from(16), - antialiasing: Some(Antialiasing::MSAAx4), - }, - &engine, - ); + let mut renderer = Renderer::new(&engine, Font::DEFAULT, Pixels::from(16)); let viewport = graphics::Viewport::with_physical_size(Size::new(3840, 2160), 2.0); diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs index c292709f..c4b57ecf 100644 --- a/examples/integration/src/main.rs +++ b/examples/integration/src/main.rs @@ -5,12 +5,12 @@ use controls::Controls; use scene::Scene; use iced_wgpu::graphics::Viewport; -use iced_wgpu::{wgpu, Engine, Renderer, Settings}; +use iced_wgpu::{wgpu, Engine, Renderer}; use iced_winit::conversion; use iced_winit::core::mouse; use iced_winit::core::renderer; use iced_winit::core::window; -use iced_winit::core::{Color, Size, Theme}; +use iced_winit::core::{Color, Font, Pixels, Size, Theme}; use iced_winit::futures; use iced_winit::runtime::program; use iced_winit::runtime::Debug; @@ -156,7 +156,8 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> { // Initialize iced let mut debug = Debug::new(); let mut engine = Engine::new(&adapter, &device, &queue, format, None); - let mut renderer = Renderer::new(Settings::default(), &engine); + let mut renderer = + Renderer::new(&engine, Font::default(), Pixels::from(16)); let mut state = program::State::new( controls, diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs index 0580399d..b1ae4e89 100644 --- a/wgpu/src/lib.rs +++ b/wgpu/src/lib.rs @@ -87,10 +87,14 @@ pub struct Renderer { } impl Renderer { - pub fn new(settings: Settings, _engine: &Engine) -> Self { + pub fn new( + _engine: &Engine, + default_font: Font, + default_text_size: Pixels, + ) -> Self { Self { - default_font: settings.default_font, - default_text_size: settings.default_text_size, + default_font, + default_text_size, layers: layer::Stack::new(), triangle_storage: triangle::Storage::new(), diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index d546a6dc..095afd48 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -289,7 +289,11 @@ impl graphics::Compositor for Compositor { } fn create_renderer(&self) -> Self::Renderer { - Renderer::new(self.settings, &self.engine) + Renderer::new( + &self.engine, + self.settings.default_font, + self.settings.default_text_size, + ) } fn create_surface<W: compositor::Window>( |