Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Frame::{set_,}{up,down}scale_filter() #1329

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/backend/renderer/damage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
//! # unimplemented!()
//! # }
//! # fn finish(self) -> Result<SyncPoint, Self::Error> { unimplemented!() }
//! # fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn downscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # fn upscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # }
//! #
//! # #[derive(Debug)]
Expand Down
4 changes: 4 additions & 0 deletions src/backend/renderer/element/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@
//! # unimplemented!()
//! # }
//! # fn finish(self) -> Result<SyncPoint, Self::Error> { unimplemented!() }
//! # fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn downscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # fn upscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # }
//! #
//! # #[derive(Debug)]
Expand Down
4 changes: 4 additions & 0 deletions src/backend/renderer/element/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,10 @@ macro_rules! render_elements_internal {
/// # unimplemented!()
/// # }
/// # fn finish(self) -> Result<SyncPoint, Self::Error> { unimplemented!() }
/// # fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
/// # fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
/// # fn downscale_filter(&self) -> TextureFilter { unimplemented!() }
/// # fn upscale_filter(&self) -> TextureFilter { unimplemented!() }
/// # }
/// #
/// # #[derive(Debug)]
Expand Down
4 changes: 4 additions & 0 deletions src/backend/renderer/element/solid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
//! # fn finish(self) -> Result<SyncPoint, Self::Error> {
//! # unimplemented!()
//! # }
//! # fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn downscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # fn upscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # }
//! #
//! # #[derive(Debug)]
Expand Down
4 changes: 4 additions & 0 deletions src/backend/renderer/element/surface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
//! # unimplemented!()
//! # }
//! # fn finish(self) -> Result<SyncPoint, Self::Error> { unimplemented!() }
//! # fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn downscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # fn upscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # }
//! #
//! # #[derive(Debug)]
Expand Down
8 changes: 8 additions & 0 deletions src/backend/renderer/element/texture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
//! # unimplemented!()
//! # }
//! # fn finish(self) -> Result<SyncPoint, Self::Error> { unimplemented!() }
//! # fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn downscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # fn upscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # }
//! #
//! # #[derive(Debug)]
Expand Down Expand Up @@ -250,6 +254,10 @@
//! # unimplemented!()
//! # }
//! # fn finish(self) -> Result<SyncPoint, Self::Error> { unimplemented!() }
//! # fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
//! # fn downscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # fn upscale_filter(&self) -> TextureFilter { unimplemented!() }
//! # }
//! #
//! # #[derive(Debug)]
Expand Down
16 changes: 16 additions & 0 deletions src/backend/renderer/gles/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2529,6 +2529,22 @@ impl<'frame> Frame for GlesFrame<'frame> {
fn wait(&mut self, sync: &SyncPoint) -> Result<(), Self::Error> {
self.renderer.wait(sync)
}

fn set_downscale_filter(&mut self, filter: TextureFilter) {
self.renderer.min_filter = filter;
}

fn set_upscale_filter(&mut self, filter: TextureFilter) {
self.renderer.max_filter = filter;
}

fn downscale_filter(&self) -> TextureFilter {
self.renderer.min_filter
}

fn upscale_filter(&self) -> TextureFilter {
self.renderer.max_filter
}
}

impl<'frame> GlesFrame<'frame> {
Expand Down
16 changes: 16 additions & 0 deletions src/backend/renderer/glow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,22 @@ impl<'frame> Frame for GlowFrame<'frame> {
fn wait(&mut self, sync: &sync::SyncPoint) -> Result<(), Self::Error> {
self.frame.as_mut().unwrap().wait(sync)
}

fn set_downscale_filter(&mut self, filter: TextureFilter) {
self.frame.as_mut().unwrap().set_downscale_filter(filter);
}

fn set_upscale_filter(&mut self, filter: TextureFilter) {
self.frame.as_mut().unwrap().set_upscale_filter(filter);
}

fn downscale_filter(&self) -> TextureFilter {
self.frame.as_ref().unwrap().downscale_filter()
}

fn upscale_filter(&self) -> TextureFilter {
self.frame.as_ref().unwrap().upscale_filter()
}
}

impl<'frame> GlowFrame<'frame> {
Expand Down
11 changes: 11 additions & 0 deletions src/backend/renderer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,17 @@ pub trait Frame {
/// Leaking might make the renderer return Errors and force it's recreation.
/// Leaking may not cause otherwise undefined behavior and program execution will always continue normally.
fn finish(self) -> Result<sync::SyncPoint, Self::Error>;

/// Set the filter method to be used when rendering a texture into a smaller area than its
/// size.
fn set_downscale_filter(&mut self, filter: TextureFilter);
/// Set the filter method to be used when rendering a texture into a larger area than its size.
fn set_upscale_filter(&mut self, filter: TextureFilter);

/// Get the current downscale filter.
fn downscale_filter(&self) -> TextureFilter;
/// Get the current upscale filter.
fn upscale_filter(&self) -> TextureFilter;
}

bitflags::bitflags! {
Expand Down
16 changes: 16 additions & 0 deletions src/backend/renderer/multigpu/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1556,6 +1556,22 @@ where
fn wait(&mut self, sync: &sync::SyncPoint) -> Result<(), Self::Error> {
self.frame.as_mut().unwrap().wait(sync).map_err(Error::Render)
}

fn set_downscale_filter(&mut self, filter: TextureFilter) {
self.frame.as_mut().unwrap().set_downscale_filter(filter);
}

fn set_upscale_filter(&mut self, filter: TextureFilter) {
self.frame.as_mut().unwrap().set_upscale_filter(filter);
}

fn downscale_filter(&self) -> TextureFilter {
self.frame.as_ref().unwrap().downscale_filter()
}

fn upscale_filter(&self) -> TextureFilter {
self.frame.as_ref().unwrap().upscale_filter()
}
}

#[cfg(feature = "wayland_frontend")]
Expand Down
16 changes: 16 additions & 0 deletions src/backend/renderer/pixman/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,22 @@ impl<'frame> Frame for PixmanFrame<'frame> {
fn finish(mut self) -> Result<super::sync::SyncPoint, Self::Error> {
self.finish_internal()
}

fn set_downscale_filter(&mut self, filter: TextureFilter) {
self.renderer.downscale_filter = filter;
}

fn set_upscale_filter(&mut self, filter: TextureFilter) {
self.renderer.upscale_filter = filter;
}

fn downscale_filter(&self) -> TextureFilter {
self.renderer.downscale_filter
}

fn upscale_filter(&self) -> TextureFilter {
self.renderer.upscale_filter
}
}

impl<'frame> PixmanFrame<'frame> {
Expand Down
9 changes: 9 additions & 0 deletions src/backend/renderer/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,15 @@ impl Frame for DummyFrame {
fn finish(self) -> Result<SyncPoint, Self::Error> {
Ok(SyncPoint::default())
}

fn set_downscale_filter(&mut self, _filter: TextureFilter) {}
fn set_upscale_filter(&mut self, _filter: TextureFilter) {}
fn downscale_filter(&self) -> TextureFilter {
TextureFilter::Linear
}
fn upscale_filter(&self) -> TextureFilter {
TextureFilter::Linear
}
}

#[derive(Clone, Debug)]
Expand Down
Loading