Move Dmabuf module from skia to base library

The Dmabuf module contains the pure wayland<->dmabuf interaction without any library dependencies and could be reused by any rendering backend.
queezle42 · May 5, 2024 · cda3a1b · cda3a1b
1 parent 36ad59d
commit cda3a1b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/quasar-wayland-skia/quasar-wayland-skia.cabal b/quasar-wayland-skia/quasar-wayland-skia.cabal
@@ -54,7 +54,6 @@ library
     Quasar.Wayland.Skia.CTypes
     Quasar.Wayland.Skia.GL
   other-modules:
-    Quasar.Wayland.Skia.Dmabuf
     Quasar.Wayland.Skia.GL.Debug
     Quasar.Wayland.Skia.GL.Egl
     Quasar.Wayland.Skia.GL.Egl.Debug
@@ -63,7 +62,6 @@ library
     Quasar.Wayland.Skia.GL.Types
     Quasar.Wayland.Skia.Thread
     Quasar.Wayland.Skia.Utils.InlineC
-    Quasar.Wayland.Skia.Utils.Stat
 
   build-depends:
     base,

diff --git a/quasar-wayland-skia/src/Quasar/Wayland/Skia.hs b/quasar-wayland-skia/src/Quasar/Wayland/Skia.hs
@@ -40,12 +40,12 @@ import Quasar.Resources.DisposableVar
 import Quasar.Resources.Rc
 import Quasar.Wayland.Client
 import Quasar.Wayland.Client.Surface
+import Quasar.Wayland.Dmabuf
 import Quasar.Wayland.Protocol
 import Quasar.Wayland.Protocol.Generated
 import Quasar.Wayland.Server.Registry (Global)
 import Quasar.Wayland.Shared.Surface
 import Quasar.Wayland.Skia.CTypes
-import Quasar.Wayland.Skia.Dmabuf
 import Quasar.Wayland.Skia.Thread
 
 

diff --git a/quasar-wayland-skia/src/Quasar/Wayland/Skia/GL.hs b/quasar-wayland-skia/src/Quasar/Wayland/Skia/GL.hs
@@ -14,13 +14,13 @@ import Language.C.Inline.Cpp.Unsafe qualified as CPPU
 import Language.C.Inline.Unsafe qualified as CU
 import Language.C.Types qualified as C
 import Quasar.Prelude
+import Quasar.Wayland.Dmabuf
 import Quasar.Wayland.Skia
 import Quasar.Wayland.Skia.CTypes
-import Quasar.Wayland.Skia.Dmabuf
 import Quasar.Wayland.Skia.GL.Egl
 import Quasar.Wayland.Skia.GL.Egl.Types (EGLImage)
-import Quasar.Wayland.Skia.GL.Types
 import Quasar.Wayland.Skia.GL.Gles (initializeGles, glGenTexture)
+import Quasar.Wayland.Skia.GL.Types
 import Quasar.Wayland.Skia.Thread
 import Text.Interpolation.Nyan (int)
 

diff --git a/quasar-wayland-skia/src/Quasar/Wayland/Skia/GL/Egl.hs b/quasar-wayland-skia/src/Quasar/Wayland/Skia/GL/Egl.hs
@@ -20,13 +20,13 @@ import Foreign.C
 import Language.C.Inline qualified as C
 import Language.C.Inline.Unsafe qualified as CU
 import Quasar.Prelude
-import Quasar.Wayland.Skia.Dmabuf
+import Quasar.Wayland.Dmabuf
 import Quasar.Wayland.Skia.GL.Egl.Debug
 import Quasar.Wayland.Skia.GL.Egl.Types
 import Quasar.Wayland.Skia.GL.Types
 import Quasar.Wayland.Skia.Utils.InlineC
-import Quasar.Wayland.Skia.Utils.Stat
 import Quasar.Wayland.Utils.SharedFd
+import Quasar.Wayland.Utils.Stat
 import System.Posix.Types (Fd(Fd))
 
 

diff --git a/quasar-wayland/quasar-wayland.cabal b/quasar-wayland/quasar-wayland.cabal
@@ -62,6 +62,7 @@ library
     Quasar.Wayland.Client.Sync
     Quasar.Wayland.Client.XdgShell
     Quasar.Wayland.Connection
+    Quasar.Wayland.Dmabuf
     Quasar.Wayland.Protocol
     Quasar.Wayland.Protocol.Generated
     Quasar.Wayland.Protocol.TH
@@ -81,6 +82,7 @@ library
     Quasar.Wayland.Shm
     Quasar.Wayland.Utils.SharedFd
     Quasar.Wayland.Utils.SharedMemory
+    Quasar.Wayland.Utils.Stat
   other-modules:
     Quasar.Wayland.Protocol.Core
     Quasar.Wayland.Utils.InlineC

diff --git a/...nd-skia/src/Quasar/Wayland/Skia/Dmabuf.hs → quasar-wayland/src/Quasar/Wayland/Dmabuf.hs b/...nd-skia/src/Quasar/Wayland/Skia/Dmabuf.hs → quasar-wayland/src/Quasar/Wayland/Dmabuf.hs
@@ -1,4 +1,4 @@
-module Quasar.Wayland.Skia.Dmabuf (
+module Quasar.Wayland.Dmabuf (
   -- * Dmabuf
   Dmabuf(..),
   DmabufPlane(..),
@@ -49,7 +49,7 @@ import Quasar.Wayland.Protocol.Generated
 import Quasar.Wayland.Server.Registry
 import Quasar.Wayland.Server.Surface
 import Quasar.Wayland.Shared.Surface
-import Quasar.Wayland.Skia.Utils.Stat (DevT(..))
+import Quasar.Wayland.Utils.Stat (DevT(..))
 import Quasar.Wayland.Utils.SharedFd
 import Quasar.Wayland.Utils.SharedMemory
 

diff --git a/...kia/src/Quasar/Wayland/Skia/Utils/Stat.hs → ...-wayland/src/Quasar/Wayland/Utils/Stat.hs b/...kia/src/Quasar/Wayland/Skia/Utils/Stat.hs → ...-wayland/src/Quasar/Wayland/Utils/Stat.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
-module Quasar.Wayland.Skia.Utils.Stat (
+module Quasar.Wayland.Utils.Stat (
   DevT(..),
   statDevT,
 ) where