diff --git a/egui-wgpu/src/renderer.rs b/egui-wgpu/src/renderer.rs index 4b162e75..89312c17 100644 --- a/egui-wgpu/src/renderer.rs +++ b/egui-wgpu/src/renderer.rs @@ -416,10 +416,14 @@ impl RenderPass { format: wgpu::TextureFormat::Rgba8UnormSrgb, usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, }); + let filter = match image_delta.filter { + egui::TextureFilter::Nearest => wgpu::FilterMode::Nearest, + egui::TextureFilter::Linear => wgpu::FilterMode::Linear, + }; let sampler = device.create_sampler(&wgpu::SamplerDescriptor { label: None, - mag_filter: wgpu::FilterMode::Linear, - min_filter: wgpu::FilterMode::Linear, + mag_filter: filter, + min_filter: filter, ..Default::default() }); let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor { @@ -488,11 +492,12 @@ impl RenderPass { /// The `Texture` must have the format `TextureFormat::Rgba8UnormSrgb` and usage /// `TextureUsage::SAMPLED`. Any compare function supplied in the `SamplerDescriptor` will be /// ignored. + #[allow(clippy::needless_pass_by_value)] // false positive pub fn register_native_texture_with_sampler_options( &mut self, device: &wgpu::Device, texture: &wgpu::TextureView, - sampler_descriptor: wgpu::SamplerDescriptor, + sampler_descriptor: wgpu::SamplerDescriptor<'_>, ) -> egui::TextureId { let sampler = device.create_sampler(&wgpu::SamplerDescriptor { compare: None, diff --git a/egui/src/context.rs b/egui/src/context.rs index 298c735c..17c86327 100644 --- a/egui/src/context.rs +++ b/egui/src/context.rs @@ -697,7 +697,7 @@ impl Context { /// ui.ctx().load_texture( /// "my-image", /// egui::ColorImage::example(), - /// egui::epaint::textures::TextureFilter::Linear + /// egui::TextureFilter::Linear /// ) /// }); /// diff --git a/egui/src/lib.rs b/egui/src/lib.rs index 3490ab0d..2ba1233a 100644 --- a/egui/src/lib.rs +++ b/egui/src/lib.rs @@ -327,7 +327,7 @@ pub use epaint::hex_color; pub use epaint::{ color, mutex, text::{FontData, FontDefinitions, FontFamily, FontId, FontTweak}, - textures::TexturesDelta, + textures::{TextureFilter, TexturesDelta}, ClippedPrimitive, Color32, ColorImage, FontImage, ImageData, Mesh, PaintCallback, PaintCallbackInfo, Rgba, Rounding, Shape, Stroke, TextureHandle, TextureId, }; diff --git a/egui/src/ui.rs b/egui/src/ui.rs index b711e41a..51215e08 100644 --- a/egui/src/ui.rs +++ b/egui/src/ui.rs @@ -1529,7 +1529,7 @@ impl Ui { /// ui.ctx().load_texture( /// "my-image", /// egui::ColorImage::example(), - /// egui::epaint::textures::TextureFilter::Linear + /// egui::TextureFilter::Linear /// ) /// }); /// diff --git a/egui/src/widgets/image.rs b/egui/src/widgets/image.rs index 9b2ba51b..eb42f7a6 100644 --- a/egui/src/widgets/image.rs +++ b/egui/src/widgets/image.rs @@ -18,7 +18,7 @@ use emath::Rot2; /// ui.ctx().load_texture( /// "my-image", /// egui::ColorImage::example(), -/// egui::epaint::textures::TextureFilter::Linear +/// egui::TextureFilter::Linear /// ) /// }); /// diff --git a/egui_demo_lib/src/color_test.rs b/egui_demo_lib/src/color_test.rs index a12188b9..6a2b9be1 100644 --- a/egui_demo_lib/src/color_test.rs +++ b/egui_demo_lib/src/color_test.rs @@ -1,4 +1,4 @@ -use egui::{color::*, epaint::textures::TextureFilter, widgets::color_picker::show_color, *}; +use egui::{color::*, widgets::color_picker::show_color, TextureFilter, *}; use std::collections::HashMap; const GRADIENT_SIZE: Vec2 = vec2(256.0, 24.0); diff --git a/egui_demo_lib/src/demo/plot_demo.rs b/egui_demo_lib/src/demo/plot_demo.rs index adff2d9b..d23d6867 100644 --- a/egui_demo_lib/src/demo/plot_demo.rs +++ b/egui_demo_lib/src/demo/plot_demo.rs @@ -552,7 +552,7 @@ impl ItemsDemo { ui.ctx().load_texture( "plot_demo", egui::ColorImage::example(), - egui::epaint::textures::TextureFilter::Linear, + egui::TextureFilter::Linear, ) }); let image = PlotImage::new( diff --git a/egui_demo_lib/src/demo/widget_gallery.rs b/egui_demo_lib/src/demo/widget_gallery.rs index 858ca6d1..f1e9d5fb 100644 --- a/egui_demo_lib/src/demo/widget_gallery.rs +++ b/egui_demo_lib/src/demo/widget_gallery.rs @@ -118,7 +118,7 @@ impl WidgetGallery { ui.ctx().load_texture( "example", egui::ColorImage::example(), - egui::epaint::textures::TextureFilter::Linear, + egui::TextureFilter::Linear, ) }); diff --git a/egui_extras/src/image.rs b/egui_extras/src/image.rs index 03d950db..1fae5ddc 100644 --- a/egui_extras/src/image.rs +++ b/egui_extras/src/image.rs @@ -1,5 +1,5 @@ -use egui::epaint::textures::TextureFilter; use egui::mutex::Mutex; +use egui::TextureFilter; /// An image to be shown in egui. /// diff --git a/egui_glow/src/painter.rs b/egui_glow/src/painter.rs index 90388af4..0c75317c 100644 --- a/egui_glow/src/painter.rs +++ b/egui_glow/src/painter.rs @@ -20,7 +20,7 @@ pub use glow::Context; const VERT_SRC: &str = include_str!("shader/vertex.glsl"); const FRAG_SRC: &str = include_str!("shader/fragment.glsl"); -pub type TextureFilter = egui::epaint::textures::TextureFilter; +pub type TextureFilter = egui::TextureFilter; trait TextureFilterExt { fn glow_code(&self) -> u32;