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

fix: Try shm-buffer imports, even if we do not have an egl-buffer reader...

This commit is contained in:
Victor Brekenfeld 2021-05-11 20:30:27 +02:00
parent e490116d9a
commit 1839756f68
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
anvil/src/buffer_utils.rs
View File

@ -66,20 +66,16 @@ impl BufferUtils {
#[cfg(feature = "egl")] #[cfg(feature = "egl")]
pub fn load_buffer<T>(&self, buffer: WlBuffer) -> Result<BufferTextures<T>, WlBuffer> { pub fn load_buffer<T>(&self, buffer: WlBuffer) -> Result<BufferTextures<T>, WlBuffer> {
let result = if let Some(reader) = &self.egl_buffer_reader.borrow().as_ref() { let egl_buffer = if let Some(reader) = &self.egl_buffer_reader.borrow().as_ref() {
reader.egl_buffer_contents(&buffer) match reader.egl_buffer_contents(&buffer) {
} else {
return Err(buffer);
};
let egl_buffer = match result {
Ok(egl) => Some(egl), Ok(egl) => Some(egl),
Err(EGLBufferAccessError::NotManaged(_)) => None, Err(EGLBufferAccessError::NotManaged(_)) => None,
Err(err) => { Err(err) => {
error!(self.log, "EGL error"; "err" => format!("{:?}", err)); error!(self.log, "EGL error"; "err" => format!("{:?}", err));
return Err(buffer); return Err(buffer);
} }
}; }
} else { None };
Ok(BufferTextures { Ok(BufferTextures {
buffer, buffer,