From 11914e97ea5e5bc1d856ccf01f70d9a2ff0c500f Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 3 Jul 2024 14:49:08 -0700 Subject: [PATCH] Use `FromGlesError` instead of `OutputNoMode` placeholder --- src/wayland/handlers/screencopy/render.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/wayland/handlers/screencopy/render.rs b/src/wayland/handlers/screencopy/render.rs index 63a73872..6ad8b027 100644 --- a/src/wayland/handlers/screencopy/render.rs +++ b/src/wayland/handlers/screencopy/render.rs @@ -294,7 +294,11 @@ pub fn render_workspace_to_buffer( let size = buffer_dimensions(buffer).unwrap(); let format = with_buffer_contents(buffer, |_, _, data| shm_format_to_fourcc(data.format)) - .map_err(|_| DTError::OutputNoMode(OutputNoMode))? // eh, we have to do some error + .map_err(|err| { + DTError::Rendering(::Error::from_gles_error( + GlesError::BufferAccessError(err), + )) + })? .expect("We should be able to convert all hardcoded shm screencopy formats"); let render_buffer = Offscreen::::create_buffer(renderer, format, size) @@ -574,7 +578,11 @@ pub fn render_window_to_buffer( let size = buffer_dimensions(buffer).unwrap(); let format = with_buffer_contents(buffer, |_, _, data| shm_format_to_fourcc(data.format)) - .map_err(|_| DTError::OutputNoMode(OutputNoMode))? // eh, we have to do some error + .map_err(|err| { + DTError::Rendering(::Error::from_gles_error( + GlesError::BufferAccessError(err), + )) + })? .expect("We should be able to convert all hardcoded shm screencopy formats"); let render_buffer = Offscreen::::create_buffer(renderer, format, size) @@ -787,7 +795,11 @@ pub fn render_cursor_to_buffer( let size = buffer_dimensions(buffer).unwrap(); let format = with_buffer_contents(buffer, |_, _, data| shm_format_to_fourcc(data.format)) - .map_err(|_| DTError::OutputNoMode(OutputNoMode))? // eh, we have to do some error + .map_err(|err| { + DTError::Rendering(::Error::from_gles_error( + GlesError::BufferAccessError(err), + )) + })? .expect("We should be able to convert all hardcoded shm screencopy formats"); let render_buffer = Offscreen::::create_buffer(renderer, format, size)