Merge pull request #482 from expipiplus1/bump-vma

Bump VMA
expipiplus1 · Oct 17, 2023 · 432af58 · 432af58
2 parents d22123a + 5a7ea54
commit 432af58
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 8 deletions.
diff --git a/VulkanMemoryAllocator/VulkanMemoryAllocator b/VulkanMemoryAllocator/VulkanMemoryAllocator
diff --git a/VulkanMemoryAllocator/VulkanMemoryAllocator.cabal b/VulkanMemoryAllocator/VulkanMemoryAllocator.cabal
@@ -5,7 +5,7 @@ cabal-version: 2.2
 -- see: https://github.com/sol/hpack
 
 name:           VulkanMemoryAllocator
-version:        0.10.5.1
+version:        0.11
 synopsis:       Bindings to the VulkanMemoryAllocator library
 category:       Graphics
 homepage:       https://github.com/expipiplus1/vulkan#readme

diff --git a/VulkanMemoryAllocator/changelog.md b/VulkanMemoryAllocator/changelog.md
@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [0.11] - 2023-10-17
+- Bump VMA
+
 ## [0.10.5.1] - 2023-10-17
 - Raise upper bound on `vulkan`
 

diff --git a/VulkanMemoryAllocator/package.yaml b/VulkanMemoryAllocator/package.yaml
@@ -1,5 +1,5 @@
 name: VulkanMemoryAllocator
-version: "0.10.5.1"
+version: "0.11"
 synopsis: Bindings to the VulkanMemoryAllocator library
 category: Graphics
 maintainer: Ellie Hermaszewska <[email protected]>

diff --git a/VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs b/VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs
@@ -175,6 +175,8 @@ module VulkanMemoryAllocator  ( createAllocator
                               , AllocationCreateInfo(..)
                               , PoolCreateInfo(..)
                               , AllocationInfo(..)
+                              , PFN_vmaCheckDefragmentationBreakFunction
+                              , FN_vmaCheckDefragmentationBreakFunction
                               , DefragmentationInfo(..)
                               , DefragmentationMove(..)
                               , DefragmentationPassMoveInfo(..)
@@ -5545,6 +5547,11 @@ instance Zero AllocationInfo where
            Nothing
 
 
+type FN_vmaCheckDefragmentationBreakFunction = ("pUserData" ::: Ptr ()) -> IO Bool32
+-- No documentation found for TopLevel "PFN_vmaCheckDefragmentationBreakFunction"
+type PFN_vmaCheckDefragmentationBreakFunction = FunPtr FN_vmaCheckDefragmentationBreakFunction
+
+
 -- | VmaDefragmentationInfo
 --
 -- Parameters for defragmentation.
@@ -5567,22 +5574,31 @@ data DefragmentationInfo = DefragmentationInfo
     --
     -- @0@ means no limit.
     maxAllocationsPerPass :: Word32
+  , -- | Optional custom callback for stopping 'beginDefragmentation'.
+    --
+    -- Have to return true for breaking current defragmentation pass.
+    pfnBreakCallback :: PFN_vmaCheckDefragmentationBreakFunction
+  , -- | Optional data to pass to custom callback for stopping pass of
+    -- defragmentation.
+    breakCallbackUserData :: Ptr ()
   }
-  deriving (Typeable, Eq)
+  deriving (Typeable)
 #if defined(GENERIC_INSTANCES)
 deriving instance Generic (DefragmentationInfo)
 #endif
 deriving instance Show DefragmentationInfo
 
 instance ToCStruct DefragmentationInfo where
-  withCStruct x f = allocaBytes 32 $ \p -> pokeCStruct p x (f p)
+  withCStruct x f = allocaBytes 48 $ \p -> pokeCStruct p x (f p)
   pokeCStruct p DefragmentationInfo{..} f = do
     poke ((p `plusPtr` 0 :: Ptr DefragmentationFlags)) (flags)
     poke ((p `plusPtr` 8 :: Ptr Pool)) (pool)
     poke ((p `plusPtr` 16 :: Ptr DeviceSize)) (maxBytesPerPass)
     poke ((p `plusPtr` 24 :: Ptr Word32)) (maxAllocationsPerPass)
+    poke ((p `plusPtr` 32 :: Ptr PFN_vmaCheckDefragmentationBreakFunction)) (pfnBreakCallback)
+    poke ((p `plusPtr` 40 :: Ptr (Ptr ()))) (breakCallbackUserData)
     f
-  cStructSize = 32
+  cStructSize = 48
   cStructAlignment = 8
   pokeZeroCStruct p f = do
     poke ((p `plusPtr` 0 :: Ptr DefragmentationFlags)) (zero)
@@ -5596,11 +5612,18 @@ instance FromCStruct DefragmentationInfo where
     pool <- peek @Pool ((p `plusPtr` 8 :: Ptr Pool))
     maxBytesPerPass <- peek @DeviceSize ((p `plusPtr` 16 :: Ptr DeviceSize))
     maxAllocationsPerPass <- peek @Word32 ((p `plusPtr` 24 :: Ptr Word32))
+    pfnBreakCallback <- peek @PFN_vmaCheckDefragmentationBreakFunction ((p `plusPtr` 32 :: Ptr PFN_vmaCheckDefragmentationBreakFunction))
+    pBreakCallbackUserData <- peek @(Ptr ()) ((p `plusPtr` 40 :: Ptr (Ptr ())))
     pure $ DefragmentationInfo
-             flags pool maxBytesPerPass maxAllocationsPerPass
+             flags
+             pool
+             maxBytesPerPass
+             maxAllocationsPerPass
+             pfnBreakCallback
+             pBreakCallbackUserData
 
 instance Storable DefragmentationInfo where
-  sizeOf ~_ = 32
+  sizeOf ~_ = 48
   alignment ~_ = 8
   peek = peekCStruct
   poke ptr poked = pokeCStruct ptr poked (pure ())
@@ -5611,6 +5634,8 @@ instance Zero DefragmentationInfo where
            zero
            zero
            zero
+           zero
+           zero
 
 
 -- | VmaDefragmentationMove

diff --git a/generate-new/readme.md b/generate-new/readme.md
@@ -36,6 +36,8 @@ In an environment with `doxygen` (`nix-shell -p doxygen`), in the
   sed -i -e 's|^GENERATE_DOCBOOK.*|GENERATE_DOCBOOK=YES|' \
          -e 's|^BRIEF_MEMBER_DESC.*|BRIEF_MEMBER_DESC=NO|' \
          -e 's|^PREDEFINED *=|PREDEFINED = VMA_STATS_STRING_ENABLED=1 |' \
+         -e 's|^PREDEFINED *=|PREDEFINED = VMA_EXTENDS_VK_STRUCT(s)=s |' \
+         -e 's|@CMAKE_SOURCE_DIR@/||' \
          Doxyfile &&
   doxygen Doxyfile)
 ```