Move SkiaImage cleanup to skia thread

queezle42 · May 15, 2024 · 4bdaa9a · 4bdaa9a
1 parent 4869a3d
commit 4bdaa9a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/quasar-wayland-skia/src/Quasar/Wayland/Skia.hs b/quasar-wayland-skia/src/Quasar/Wayland/Skia.hs
@@ -56,7 +56,8 @@ import Quasar.Wayland.Utils.Resources
 C.context (CPP.cppCtx <> C.fptrCtx <> mempty {
   C.ctxTypesTable = Map.fromList [
     (C.TypeName "GrDirectContext", [t|GrDirectContext|]),
-    (C.TypeName "SkSurface", [t|SkSurface|])
+    (C.TypeName "SkSurface", [t|SkSurface|]),
+    (C.TypeName "SkImage", [t|SkImage|])
   ]
 })
 
@@ -82,7 +83,7 @@ class Typeable s => IsSkiaBackend s where
   newSkiaBackendTexture :: Skia s -> Int32 -> Int32 -> SkiaIO (Ptr SkSurface, SkiaTextureStorage s)
   destroySkiaTextureStorage :: Skia s -> SkiaSurfaceState s -> SkiaIO ()
   exportSkiaSurfaceDmabuf :: SkiaSurfaceState s -> SkiaIO Dmabuf
-  skiaImportDmabuf :: Skia s -> Dmabuf -> SkiaIO SkiaImage
+  skiaImportDmabuf :: Skia s -> Dmabuf -> SkiaIO (Ptr SkImage)
 
 data Skia s = Skia {
   disposer :: Disposer,
@@ -167,13 +168,8 @@ readSkiaSurfaceStateIO (SkiaSurface var) =
     Nothing -> undefined
     Just surfaceState -> pure surfaceState
 
-data SkiaImage = SkiaImage {
-  skImage :: Ptr SkImage,
-  disposer :: Disposer
-}
-
-instance Disposable SkiaImage where
-  getDisposer surface = surface.disposer
+newtype SkiaImage = SkiaImage (DisposableVar (Ptr SkImage))
+  deriving Disposable
 
 --newtype ManagedSkiaSurface = ManagedSkiaSurface {
 --  skSurface :: ForeignPtr SkSurface
@@ -416,8 +412,21 @@ importDmabuf skia frameRelease rc = do
   atomicallyC (tryReadRc rc) >>= \case
     Nothing -> undefined
     Just (ExternalDmabuf _ (Borrowed _ dmabuf)) -> do
-      readonlySurface <- skiaImportDmabuf skia dmabuf
-      liftIO $ newRcIO (SkiaRenderedFrameImportedDmabuf frameRelease readonlySurface rc)
+      skImage <- skiaImportDmabuf skia dmabuf
+      skiaImage <- liftIO $ newSkiaImage skia skImage
+
+      liftIO $ newRcIO (SkiaRenderedFrameImportedDmabuf frameRelease skiaImage rc)
+
+
+newSkiaImage :: Skia s -> Ptr SkImage -> IO SkiaImage
+newSkiaImage skia skImage =
+  SkiaImage <$> newFnDisposableVarIO skia.exceptionSink destroyImage skImage
+  where
+    destroyImage :: Ptr SkImage -> IO ()
+    destroyImage ptr = runSkiaIO skia.thread $ liftIO do
+      [CPPU.throwBlock|void {
+        delete $(SkImage* ptr);
+      }|]
 
 skiaDmabufGlobal :: IsSkiaBackend s => Skia s -> Global
 skiaDmabufGlobal skia =

diff --git a/quasar-wayland-skia/src/Quasar/Wayland/Skia/GL.hs b/quasar-wayland-skia/src/Quasar/Wayland/Skia/GL.hs
@@ -383,7 +383,7 @@ destroySkiaGLTexture skia surfaceState = liftIO do
   glDeleteTexture surfaceState.storage.glTexture
 
 
-skiaGLImportDmabuf :: Skia GL -> Dmabuf -> SkiaIO SkiaImage
+skiaGLImportDmabuf :: Skia GL -> Dmabuf -> SkiaIO (Ptr SkImage)
 skiaGLImportDmabuf skia dmabuf = liftIO do
   let grDirectContext = skia.grDirectContext
 
@@ -443,12 +443,4 @@ skiaGLImportDmabuf skia dmabuf = liftIO do
   when (skImage == nullPtr) do
     throwIO $ userError "Failed to create skia image from external texture"
 
-  disposer <- atomicallyC do
-    newUnmanagedIODisposer [CPPU.throwBlock|void {
-      delete $(SkImage* skImage);
-    }|] skia.exceptionSink
-
-  pure SkiaImage {
-    skImage,
-    disposer
-  }
+  pure skImage