gfx: implement async shm downloads

src/gfx_apis/gl/renderer/context.rs

@@ -5,7 +5,7 @@ use {
         format::{Format, XRGB8888},
         gfx_api::{
             AsyncShmGfxTexture, BufferResvUser, GfxContext, GfxError, GfxFormat, GfxFramebuffer,
-            GfxImage, ResetStatus, ShmGfxTexture,
+            GfxImage, GfxInternalFramebuffer, ResetStatus, ShmGfxTexture,
         },
         gfx_apis::gl::{
             egl::{context::EglContext, display::EglDisplay, image::EglImage},
@@ -316,13 +316,14 @@ impl GfxContext for GlRenderContext {
         GfxApi::OpenGl
     }
 
-    fn create_fb(
+    fn create_internal_fb(
         self: Rc<Self>,
+        _cpu_worker: &Rc<CpuWorker>,
         width: i32,
         height: i32,
         _stride: i32,
         format: &'static Format,
-    ) -> Result<Rc<dyn GfxFramebuffer>, GfxError> {
+    ) -> Result<Rc<dyn GfxInternalFramebuffer>, GfxError> {
         let fb = self.ctx.with_current(|| unsafe {
             GlRenderBuffer::new(&self.ctx, width, height, format)?.create_framebuffer()
         })?;

src/gfx_apis/gl/renderer/framebuffer.rs

@@ -1,7 +1,11 @@
 use {
     crate::{
         format::Format,
-        gfx_api::{AcquireSync, GfxApiOpt, GfxError, GfxFramebuffer, ReleaseSync, SyncFile},
+        gfx_api::{
+            AcquireSync, AsyncShmGfxTextureCallback, GfxApiOpt, GfxError, GfxFramebuffer,
+            GfxInternalFramebuffer, GfxStagingBuffer, PendingShmTransfer, ReleaseSync, ShmMemory,
+            SyncFile,
+        },
         gfx_apis::gl::{
             gl::{
                 frame_buffer::GlFrameBuffer,
@@ -13,6 +17,7 @@ use {
             sys::{GL_ONE, GL_ONE_MINUS_SRC_ALPHA},
             RenderError,
         },
+        rect::Region,
         theme::Color,
     },
     std::{
@@ -104,11 +109,31 @@ impl GfxFramebuffer for Framebuffer {
         self.render(acquire_sync, ops, clear).map_err(|e| e.into())
     }
 
-    fn copy_to_shm(self: Rc<Self>, shm: &[Cell<u8>]) -> Result<(), GfxError> {
-        (*self).copy_to_shm(shm).map_err(|e| e.into())
-    }
-
     fn format(&self) -> &'static Format {
         self.gl.rb.format
     }
 }
+
+impl GfxInternalFramebuffer for Framebuffer {
+    fn into_fb(self: Rc<Self>) -> Rc<dyn GfxFramebuffer> {
+        self
+    }
+
+    fn staging_size(&self) -> usize {
+        0
+    }
+
+    fn download(
+        self: Rc<Self>,
+        _staging: &Rc<dyn GfxStagingBuffer>,
+        _callback: Rc<dyn AsyncShmGfxTextureCallback>,
+        mem: Rc<dyn ShmMemory>,
+        _damage: Region,
+    ) -> Result<Option<PendingShmTransfer>, GfxError> {
+        let mut res = Ok(());
+        mem.access(&mut |mem| res = self.copy_to_shm(mem))
+            .map_err(RenderError::AccessFailed)?;
+        res?;
+        Ok(None)
+    }
+}