vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gles2: Fixup texture filtering

This commit is contained in:
Victor Brekenfeld 2022-01-10 19:30:48 +01:00
parent bffae036f7
commit fefb287fa8
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/backend/renderer/gles2/mod.rs
View File

@ -178,6 +178,8 @@ pub struct Gles2Renderer {
// This field is only accessed if the image or wayland_frontend features are active // This field is only accessed if the image or wayland_frontend features are active
#[allow(dead_code)] #[allow(dead_code)]
destruction_callback_sender: Sender<CleanupResource>, destruction_callback_sender: Sender<CleanupResource>,
min_filter: TextureFilter,
max_filter: TextureFilter,
logger_ptr: Option<*mut ::slog::Logger>, logger_ptr: Option<*mut ::slog::Logger>,
logger: ::slog::Logger, logger: ::slog::Logger,
_not_send: *mut (), _not_send: *mut (),
@ -192,6 +194,8 @@ pub struct Gles2Frame {
solid_program: Gles2SolidProgram, solid_program: Gles2SolidProgram,
vbos: [ffi::types::GLuint; 2], vbos: [ffi::types::GLuint; 2],
size: Size<i32, Physical>, size: Size<i32, Physical>,
min_filter: TextureFilter,
max_filter: TextureFilter,
} }
impl fmt::Debug for Gles2Frame { impl fmt::Debug for Gles2Frame {
@ -201,6 +205,8 @@ impl fmt::Debug for Gles2Frame {
.field("tex_programs", &self.tex_programs) .field("tex_programs", &self.tex_programs)
.field("solid_program", &self.solid_program) .field("solid_program", &self.solid_program)
.field("size", &self.size) .field("size", &self.size)
.field("min_filter", &self.min_filter)
.field("max_filter", &self.max_filter)
.finish_non_exhaustive() .finish_non_exhaustive()
} }
} }
@ -216,6 +222,8 @@ impl fmt::Debug for Gles2Renderer {
.field("solid_program", &self.solid_program) .field("solid_program", &self.solid_program)
// ffi::Gles2 does not implement Debug // ffi::Gles2 does not implement Debug
.field("egl", &self.egl) .field("egl", &self.egl)
.field("min_filter", &self.min_filter)
.field("max_filter", &self.max_filter)
.field("logger", &self.logger) .field("logger", &self.logger)
.finish() .finish()
} }
@ -522,7 +530,7 @@ impl Gles2Renderer {
gl.BindBuffer(ffi::ARRAY_BUFFER, 0); gl.BindBuffer(ffi::ARRAY_BUFFER, 0);
let (tx, rx) = channel(); let (tx, rx) = channel();
let mut renderer = Gles2Renderer { let renderer = Gles2Renderer {
gl, gl,
egl: context, egl: context,
#[cfg(all(feature = "wayland_frontend", feature = "use_system_lib"))] #[cfg(all(feature = "wayland_frontend", feature = "use_system_lib"))]
@ -538,12 +546,12 @@ impl Gles2Renderer {
destruction_callback: rx, destruction_callback: rx,
destruction_callback_sender: tx, destruction_callback_sender: tx,
vbos, vbos,
min_filter: TextureFilter::Nearest,
max_filter: TextureFilter::Linear,
logger_ptr, logger_ptr,
logger: log, logger: log,
_not_send: std::ptr::null_mut(), _not_send: std::ptr::null_mut(),
}; };
renderer.downscale_filter(TextureFilter::Nearest)?;
renderer.upscale_filter(TextureFilter::Linear)?;
renderer.egl.unbind()?; renderer.egl.unbind()?;
Ok(renderer) Ok(renderer)
} }
@ -636,7 +644,6 @@ impl ImportShm for Gles2Renderer {
unsafe { unsafe {
self.gl.BindTexture(ffi::TEXTURE_2D, texture.0.texture); self.gl.BindTexture(ffi::TEXTURE_2D, texture.0.texture);
self.gl self.gl
.TexParameteri(ffi::TEXTURE_2D, ffi::TEXTURE_WRAP_S, ffi::CLAMP_TO_EDGE as i32); .TexParameteri(ffi::TEXTURE_2D, ffi::TEXTURE_WRAP_S, ffi::CLAMP_TO_EDGE as i32);
self.gl self.gl
@ -1053,31 +1060,11 @@ impl Renderer for Gles2Renderer {
type Frame = Gles2Frame; type Frame = Gles2Frame;
fn downscale_filter(&mut self, filter: TextureFilter) -> Result<(), Self::Error> { fn downscale_filter(&mut self, filter: TextureFilter) -> Result<(), Self::Error> {
self.make_current()?; self.min_filter = filter;
unsafe {
self.gl.TexParameteri(
ffi::TEXTURE_2D,
ffi::TEXTURE_MIN_FILTER,
match filter {
TextureFilter::Nearest => ffi::NEAREST as i32,
TextureFilter::Linear => ffi::LINEAR as i32,
},
);
}
Ok(()) Ok(())
} }
fn upscale_filter(&mut self, filter: TextureFilter) -> Result<(), Self::Error> { fn upscale_filter(&mut self, filter: TextureFilter) -> Result<(), Self::Error> {
self.make_current()?; self.max_filter = filter;
unsafe {
self.gl.TexParameteri(
ffi::TEXTURE_2D,
ffi::TEXTURE_MAG_FILTER,
match filter {
TextureFilter::Nearest => ffi::NEAREST as i32,
TextureFilter::Linear => ffi::LINEAR as i32,
},
);
}
Ok(()) Ok(())
} }
@ -1133,6 +1120,8 @@ impl Renderer for Gles2Renderer {
transform, transform,
vbos: self.vbos, vbos: self.vbos,
size, size,
min_filter: self.min_filter,
max_filter: self.max_filter,
}; };
let result = rendering(self, &mut frame); let result = rendering(self, &mut frame);
@ -1350,8 +1339,22 @@ impl Gles2Frame {
unsafe { unsafe {
self.gl.ActiveTexture(ffi::TEXTURE0); self.gl.ActiveTexture(ffi::TEXTURE0);
self.gl.BindTexture(target, tex.0.texture); self.gl.BindTexture(target, tex.0.texture);
self.gl self.gl.TexParameteri(
.TexParameteri(target, ffi::TEXTURE_MIN_FILTER, ffi::LINEAR as i32); ffi::TEXTURE_2D,
ffi::TEXTURE_MIN_FILTER,
match self.min_filter {
TextureFilter::Nearest => ffi::NEAREST as i32,
TextureFilter::Linear => ffi::LINEAR as i32,
},
);
self.gl.TexParameteri(
ffi::TEXTURE_2D,
ffi::TEXTURE_MAG_FILTER,
match self.max_filter {
TextureFilter::Nearest => ffi::NEAREST as i32,
TextureFilter::Linear => ffi::LINEAR as i32,
},
);
self.gl.UseProgram(self.tex_programs[tex.0.texture_kind].program); self.gl.UseProgram(self.tex_programs[tex.0.texture_kind].program);
self.gl self.gl