diff --git a/VulkanMemoryAllocator.cabal b/VulkanMemoryAllocator.cabal
--- a/VulkanMemoryAllocator.cabal
+++ b/VulkanMemoryAllocator.cabal
@@ -1,11 +1,11 @@
cabal-version: 2.2
--- This file has been generated from package.yaml by hpack version 0.34.3.
+-- This file has been generated from package.yaml by hpack version 0.34.4.
--
-- see: https://github.com/sol/hpack
name: VulkanMemoryAllocator
-version: 0.3.12
+version: 0.4
synopsis: Bindings to the VulkanMemoryAllocator library
category: Graphics
homepage: https://github.com/expipiplus1/vulkan#readme
@@ -49,7 +49,40 @@
VulkanMemoryAllocator
hs-source-dirs:
src
- default-extensions: AllowAmbiguousTypes CPP DataKinds DefaultSignatures DeriveAnyClass DeriveGeneric DerivingStrategies DuplicateRecordFields FlexibleContexts FlexibleInstances GADTs GeneralizedNewtypeDeriving InstanceSigs LambdaCase MagicHash NoMonomorphismRestriction OverloadedStrings PartialTypeSignatures PatternSynonyms PolyKinds QuantifiedConstraints RankNTypes RecordWildCards RoleAnnotations ScopedTypeVariables StandaloneDeriving Strict TypeApplications TypeFamilyDependencies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns
+ default-extensions:
+ AllowAmbiguousTypes
+ CPP
+ DataKinds
+ DefaultSignatures
+ DeriveAnyClass
+ DeriveGeneric
+ DerivingStrategies
+ DuplicateRecordFields
+ FlexibleContexts
+ FlexibleInstances
+ GADTs
+ GeneralizedNewtypeDeriving
+ InstanceSigs
+ LambdaCase
+ MagicHash
+ NoMonomorphismRestriction
+ OverloadedStrings
+ PartialTypeSignatures
+ PatternSynonyms
+ PolyKinds
+ QuantifiedConstraints
+ RankNTypes
+ RecordWildCards
+ RoleAnnotations
+ ScopedTypeVariables
+ StandaloneDeriving
+ Strict
+ TypeApplications
+ TypeFamilyDependencies
+ TypeOperators
+ TypeSynonymInstances
+ UndecidableInstances
+ ViewPatterns
ghc-options: -Wall -Wno-unticked-promoted-constructors -Wno-missing-pattern-synonym-signatures -Wno-unused-imports -Wno-missing-signatures -Wno-partial-type-signatures
cxx-options: -std=c++11
include-dirs:
@@ -63,7 +96,7 @@
, bytestring
, transformers
, vector
- , vulkan >=3.6 && <3.10
+ , vulkan >=3.6 && <3.11
if flag(safe-foreign-calls)
cpp-options: -DSAFE_FOREIGN_CALLS
if flag(vma-ndebug)
diff --git a/VulkanMemoryAllocator/src/vk_mem_alloc.h b/VulkanMemoryAllocator/src/vk_mem_alloc.h
--- a/VulkanMemoryAllocator/src/vk_mem_alloc.h
+++ b/VulkanMemoryAllocator/src/vk_mem_alloc.h
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -25,9 +25,9 @@
/** \mainpage Vulkan Memory Allocator
-Version 3.0.0-development (2020-11-03)
+Version 3.0.0-development (2021-02-16)
-Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved. \n
+Copyright (c) 2017-2021 Advanced Micro Devices, Inc. All rights reserved. \n
License: MIT
Documentation of all members: vk_mem_alloc.h
@@ -2114,6 +2114,15 @@
#endif
#endif
+// Defined to 1 when VK_EXT_memory_priority device extension is defined in Vulkan headers.
+#if !defined(VMA_MEMORY_PRIORITY)
+ #if VK_EXT_memory_priority
+ #define VMA_MEMORY_PRIORITY 1
+ #else
+ #define VMA_MEMORY_PRIORITY 0
+ #endif
+#endif
+
// Define these macros to decorate all public functions with additional code,
// before and after returned type, appropriately. This may be useful for
// exporting the functions when compiling VMA as a separate library. Example:
@@ -2316,7 +2325,24 @@
For more information, see documentation chapter \ref enabling_buffer_device_address.
*/
VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT = 0x00000020,
+ /**
+ Enables usage of VK_EXT_memory_priority extension in the library.
+ You may set this flag only if you found available and enabled this device extension,
+ along with `VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority == VK_TRUE`,
+ while creating Vulkan device passed as VmaAllocatorCreateInfo::device.
+
+ When this flag is used, VmaAllocationCreateInfo::priority and VmaPoolCreateInfo::priority
+ are used to set priorities of allocated Vulkan memory. Without it, these variables are ignored.
+
+ A priority must be a floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations.
+ Larger values are higher priority. The granularity of the priorities is implementation-dependent.
+ It is automatically passed to every call to `vkAllocateMemory` done by the library using structure `VkMemoryPriorityAllocateInfoEXT`.
+ The value to be used for default priority is 0.5.
+ For more details, see the documentation of the VK_EXT_memory_priority extension.
+ */
+ VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT = 0x00000040,
+
VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF
} VmaAllocatorCreateFlagBits;
typedef VkFlags VmaAllocatorCreateFlags;
@@ -2892,6 +2918,13 @@
internal buffer, so it doesn't need to be valid after allocation call.
*/
void* VMA_NULLABLE pUserData;
+ /** \brief A floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations.
+
+ It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object
+ and this allocation ends up as dedicated or is explicitly forced as dedicated using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.
+ Otherwise, it has the priority of a memory block where it is placed and this variable is ignored.
+ */
+ float priority;
} VmaAllocationCreateInfo;
/**
@@ -3056,6 +3089,12 @@
become lost, set this value to 0.
*/
uint32_t frameInUseCount;
+ /** \brief A floating-point value between 0 and 1, indicating the priority of the allocations in this pool relative to other memory allocations.
+
+ It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object.
+ Otherwise, this variable is ignored.
+ */
+ float priority;
} VmaPoolCreateInfo;
/** \brief Describes parameter of existing #VmaPool.
@@ -7029,7 +7068,8 @@
VkDeviceSize bufferImageGranularity,
uint32_t frameInUseCount,
bool explicitBlockSize,
- uint32_t algorithm);
+ uint32_t algorithm,
+ float priority);
~VmaBlockVector();
VkResult CreateMinBlocks();
@@ -7112,6 +7152,7 @@
const uint32_t m_FrameInUseCount;
const bool m_ExplicitBlockSize;
const uint32_t m_Algorithm;
+ const float m_Priority;
VMA_RW_MUTEX m_Mutex;
/* There can be at most one allocation that is completely empty (except when minBlockCount > 0) -
@@ -7855,6 +7896,7 @@
bool m_UseExtMemoryBudget;
bool m_UseAmdDeviceCoherentMemory;
bool m_UseKhrBufferDeviceAddress;
+ bool m_UseExtMemoryPriority;
VkDevice m_hDevice;
VkInstance m_hInstance;
bool m_AllocationCallbacksSpecified;
@@ -8125,6 +8167,7 @@
bool map,
bool isUserDataString,
void* pUserData,
+ float priority,
VkBuffer dedicatedBuffer,
VkBufferUsageFlags dedicatedBufferUsage,
VkImage dedicatedImage,
@@ -9613,7 +9656,7 @@
// Check previous suballocations for BufferImageGranularity conflicts.
// Make bigger alignment if necessary.
- if(bufferImageGranularity > 1)
+ if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment)
{
bool bufferImageGranularityConflict = false;
VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;
@@ -9697,7 +9740,7 @@
// Check next suballocations for BufferImageGranularity conflicts.
// If conflict exists, we must mark more allocations lost or fail.
- if(bufferImageGranularity > 1)
+ if(allocSize % bufferImageGranularity || *pOffset % bufferImageGranularity)
{
VmaSuballocationList::const_iterator nextSuballocItem = lastSuballocItem;
++nextSuballocItem;
@@ -9756,7 +9799,7 @@
// Check previous suballocations for BufferImageGranularity conflicts.
// Make bigger alignment if necessary.
- if(bufferImageGranularity > 1)
+ if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment)
{
bool bufferImageGranularityConflict = false;
VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;
@@ -9796,7 +9839,7 @@
// Check next suballocations for BufferImageGranularity conflicts.
// If conflict exists, allocation cannot be made here.
- if(bufferImageGranularity > 1)
+ if(allocSize % bufferImageGranularity || *pOffset % bufferImageGranularity)
{
VmaSuballocationList::const_iterator nextSuballocItem = suballocItem;
++nextSuballocItem;
@@ -10964,7 +11007,7 @@
// Check next suballocations from 2nd for BufferImageGranularity conflicts.
// Make bigger alignment if necessary.
- if(bufferImageGranularity > 1 && !suballocations2nd.empty())
+ if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty())
{
bool bufferImageGranularityConflict = false;
for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )
@@ -11069,7 +11112,7 @@
// Check previous suballocations for BufferImageGranularity conflicts.
// Make bigger alignment if necessary.
- if(bufferImageGranularity > 1 && !suballocations1st.empty())
+ if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations1st.empty())
{
bool bufferImageGranularityConflict = false;
for(size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )
@@ -11101,7 +11144,7 @@
{
// Check next suballocations for BufferImageGranularity conflicts.
// If conflict exists, allocation cannot be made here.
- if(bufferImageGranularity > 1 && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
+ if((allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity) && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)
{
for(size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )
{
@@ -11159,7 +11202,7 @@
// Check previous suballocations for BufferImageGranularity conflicts.
// Make bigger alignment if necessary.
- if(bufferImageGranularity > 1 && !suballocations2nd.empty())
+ if(bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty())
{
bool bufferImageGranularityConflict = false;
for(size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; )
@@ -11217,7 +11260,7 @@
// Check next suballocations for BufferImageGranularity conflicts.
// If conflict exists, we must mark more allocations lost or fail.
- if(bufferImageGranularity > 1)
+ if(allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity)
{
while(index1st < suballocations1st.size())
{
@@ -11263,7 +11306,7 @@
{
// Check next suballocations for BufferImageGranularity conflicts.
// If conflict exists, allocation cannot be made here.
- if(bufferImageGranularity > 1)
+ if(allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity)
{
for(size_t nextSuballocIndex = index1st;
nextSuballocIndex < suballocations1st.size();
@@ -12562,7 +12605,8 @@
(createInfo.flags & VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(),
createInfo.frameInUseCount,
createInfo.blockSize != 0, // explicitBlockSize
- createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK), // algorithm
+ createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK,
+ createInfo.priority), // algorithm
m_Id(0),
m_Name(VMA_NULL)
{
@@ -12601,7 +12645,8 @@
VkDeviceSize bufferImageGranularity,
uint32_t frameInUseCount,
bool explicitBlockSize,
- uint32_t algorithm) :
+ uint32_t algorithm,
+ float priority) :
m_hAllocator(hAllocator),
m_hParentPool(hParentPool),
m_MemoryTypeIndex(memoryTypeIndex),
@@ -12612,6 +12657,7 @@
m_FrameInUseCount(frameInUseCount),
m_ExplicitBlockSize(explicitBlockSize),
m_Algorithm(algorithm),
+ m_Priority(priority),
m_HasEmptyBlock(false),
m_Blocks(VmaStlAllocator(hAllocator->GetAllocationCallbacks())),
m_NextBlockId(0)
@@ -13308,6 +13354,15 @@
}
#endif // #if VMA_BUFFER_DEVICE_ADDRESS
+#if VMA_MEMORY_PRIORITY
+ VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };
+ if(m_hAllocator->m_UseExtMemoryPriority)
+ {
+ priorityInfo.priority = m_Priority;
+ VmaPnextChainPushFront(&allocInfo, &priorityInfo);
+ }
+#endif // #if VMA_MEMORY_PRIORITY
+
VkDeviceMemory mem = VK_NULL_HANDLE;
VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem);
if(res < 0)
@@ -15666,6 +15721,7 @@
m_UseExtMemoryBudget((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0),
m_UseAmdDeviceCoherentMemory((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT) != 0),
m_UseKhrBufferDeviceAddress((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT) != 0),
+ m_UseExtMemoryPriority((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT) != 0),
m_hDevice(pCreateInfo->device),
m_hInstance(pCreateInfo->instance),
m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL),
@@ -15737,6 +15793,12 @@
VMA_ASSERT(0 && "vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros.");
}
#endif
+#if !(VMA_MEMORY_PRIORITY)
+ if(m_UseExtMemoryPriority)
+ {
+ VMA_ASSERT(0 && "VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.");
+ }
+#endif
memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks));
memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties));
@@ -15798,7 +15860,8 @@
GetBufferImageGranularity(),
pCreateInfo->frameInUseCount,
false, // explicitBlockSize
- false); // linearAlgorithm
+ false, // linearAlgorithm
+ 0.5f); // priority (0.5 is the default per Vulkan spec)
// No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here,
// becase minBlockCount is 0.
m_pDedicatedAllocations[memTypeIndex] = vma_new(this, AllocationVectorType)(VmaStlAllocator(GetAllocationCallbacks()));
@@ -16153,6 +16216,7 @@
(finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
(finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
finalCreateInfo.pUserData,
+ finalCreateInfo.priority,
dedicatedBuffer,
dedicatedBufferUsage,
dedicatedImage,
@@ -16190,6 +16254,7 @@
(finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,
(finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,
finalCreateInfo.pUserData,
+ finalCreateInfo.priority,
dedicatedBuffer,
dedicatedBufferUsage,
dedicatedImage,
@@ -16219,6 +16284,7 @@
bool map,
bool isUserDataString,
void* pUserData,
+ float priority,
VkBuffer dedicatedBuffer,
VkBufferUsageFlags dedicatedBufferUsage,
VkImage dedicatedImage,
@@ -16281,6 +16347,15 @@
}
}
#endif // #if VMA_BUFFER_DEVICE_ADDRESS
+
+#if VMA_MEMORY_PRIORITY
+ VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };
+ if(m_UseExtMemoryPriority)
+ {
+ priorityInfo.priority = priority;
+ VmaPnextChainPushFront(&allocInfo, &priorityInfo);
+ }
+#endif // #if VMA_MEMORY_PRIORITY
size_t allocIndex;
VkResult res = VK_SUCCESS;
diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,9 @@
## WIP
+## [0.4] - 2021-02-18
+- Bump VMA, support for VK_EXT_memory_priority
+
## [0.3.12] - 2021-01-09
- Calling traceEventIO before and after every VulkanMemoryAllocator command if
diff --git a/package.yaml b/package.yaml
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
name: VulkanMemoryAllocator
-version: "0.3.12"
+version: "0.4"
synopsis: Bindings to the VulkanMemoryAllocator library
category: Graphics
maintainer: Joe Hermaszewski
@@ -20,7 +20,7 @@
src/lib.cpp
dependencies:
- base <5
- - vulkan >= 3.6 && < 3.10
+ - vulkan >= 3.6 && < 3.11
- bytestring
- transformers
- vector
diff --git a/src/VulkanMemoryAllocator.hs b/src/VulkanMemoryAllocator.hs
--- a/src/VulkanMemoryAllocator.hs
+++ b/src/VulkanMemoryAllocator.hs
@@ -77,6 +77,7 @@
, ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT
, ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT
, ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT
+ , ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT
, ..
)
, VulkanFunctions(..)
@@ -233,6 +234,9 @@
import Data.Bits (FiniteBits)
import Data.Typeable (Typeable)
import Foreign.C.Types (CChar)
+import Foreign.C.Types (CFloat)
+import Foreign.C.Types (CFloat(..))
+import Foreign.C.Types (CFloat(CFloat))
import Foreign.C.Types (CSize)
import Foreign.C.Types (CSize(..))
import Foreign.C.Types (CSize(CSize))
@@ -1012,8 +1016,8 @@
allocateMemoryPages allocator vkMemoryRequirements createInfo = liftIO . evalContT $ do
pPVkMemoryRequirements <- ContT $ allocaBytesAligned @MemoryRequirements ((Data.Vector.length (vkMemoryRequirements)) * 24) 8
Data.Vector.imapM_ (\i e -> ContT $ pokeCStruct (pPVkMemoryRequirements `plusPtr` (24 * (i)) :: Ptr MemoryRequirements) (e) . ($ ())) (vkMemoryRequirements)
- pPCreateInfo <- ContT $ allocaBytesAligned @AllocationCreateInfo ((Data.Vector.length (createInfo)) * 40) 8
- lift $ Data.Vector.imapM_ (\i e -> poke (pPCreateInfo `plusPtr` (40 * (i)) :: Ptr AllocationCreateInfo) (e)) (createInfo)
+ pPCreateInfo <- ContT $ allocaBytesAligned @AllocationCreateInfo ((Data.Vector.length (createInfo)) * 48) 8
+ lift $ Data.Vector.imapM_ (\i e -> poke (pPCreateInfo `plusPtr` (48 * (i)) :: Ptr AllocationCreateInfo) (e)) (createInfo)
let pVkMemoryRequirementsLength = Data.Vector.length $ (vkMemoryRequirements)
lift $ unless ((Data.Vector.length $ (createInfo)) == pVkMemoryRequirementsLength) $
throwIO $ IOError Nothing InvalidArgument "" "pCreateInfo and pVkMemoryRequirements must have the same length" Nothing Nothing
@@ -2698,6 +2702,26 @@
-- For more information, see documentation chapter /Enabling buffer device
-- address/.
pattern ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT = AllocatorCreateFlagBits 0x00000020
+-- | Enables usage of VK_EXT_memory_priority extension in the library.
+--
+-- You may set this flag only if you found available and enabled this
+-- device extension, along with
+-- @VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority == VK_TRUE@,
+-- while creating Vulkan device passed as /VmaAllocatorCreateInfo::device/.
+--
+-- When this flag is used, /VmaAllocationCreateInfo::priority/ and
+-- /VmaPoolCreateInfo::priority/ are used to set priorities of allocated
+-- Vulkan memory. Without it, these variables are ignored.
+--
+-- A priority must be a floating-point value between 0 and 1, indicating
+-- the priority of the allocation relative to other memory allocations.
+-- Larger values are higher priority. The granularity of the priorities is
+-- implementation-dependent. It is automatically passed to every call to
+-- @vkAllocateMemory@ done by the library using structure
+-- @VkMemoryPriorityAllocateInfoEXT@. The value to be used for default
+-- priority is 0.5. For more details, see the documentation of the
+-- VK_EXT_memory_priority extension.
+pattern ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT = AllocatorCreateFlagBits 0x00000040
conNameAllocatorCreateFlagBits :: String
conNameAllocatorCreateFlagBits = "AllocatorCreateFlagBits"
@@ -2713,6 +2737,7 @@
, (ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT , "EXT_MEMORY_BUDGET_BIT")
, (ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT, "AMD_DEVICE_COHERENT_MEMORY_BIT")
, (ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT , "BUFFER_DEVICE_ADDRESS_BIT")
+ , (ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT , "EXT_MEMORY_PRIORITY_BIT")
]
instance Show AllocatorCreateFlagBits where
@@ -3788,6 +3813,15 @@
-- then copied to internal buffer, so it doesn\'t need to be valid after
-- allocation call.
userData :: Ptr ()
+ , -- | A floating-point value between 0 and 1, indicating the priority of the
+ -- allocation relative to other memory allocations.
+ --
+ -- It is used only when 'ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT' flag was
+ -- used during creation of the 'Allocator' object and this allocation ends
+ -- up as dedicated or is explicitly forced as dedicated using
+ -- 'ALLOCATION_CREATE_DEDICATED_MEMORY_BIT'. Otherwise, it has the priority
+ -- of a memory block where it is placed and this variable is ignored.
+ priority :: Float
}
deriving (Typeable)
#if defined(GENERIC_INSTANCES)
@@ -3796,7 +3830,7 @@
deriving instance Show AllocationCreateInfo
instance ToCStruct AllocationCreateInfo where
- withCStruct x f = allocaBytesAligned 40 8 $ \p -> pokeCStruct p x (f p)
+ withCStruct x f = allocaBytesAligned 48 8 $ \p -> pokeCStruct p x (f p)
pokeCStruct p AllocationCreateInfo{..} f = do
poke ((p `plusPtr` 0 :: Ptr AllocationCreateFlags)) (flags)
poke ((p `plusPtr` 4 :: Ptr MemoryUsage)) (usage)
@@ -3805,8 +3839,9 @@
poke ((p `plusPtr` 16 :: Ptr Word32)) (memoryTypeBits)
poke ((p `plusPtr` 24 :: Ptr Pool)) (pool)
poke ((p `plusPtr` 32 :: Ptr (Ptr ()))) (userData)
+ poke ((p `plusPtr` 40 :: Ptr CFloat)) (CFloat (priority))
f
- cStructSize = 40
+ cStructSize = 48
cStructAlignment = 8
pokeZeroCStruct p f = do
poke ((p `plusPtr` 0 :: Ptr AllocationCreateFlags)) (zero)
@@ -3814,6 +3849,7 @@
poke ((p `plusPtr` 8 :: Ptr MemoryPropertyFlags)) (zero)
poke ((p `plusPtr` 12 :: Ptr MemoryPropertyFlags)) (zero)
poke ((p `plusPtr` 16 :: Ptr Word32)) (zero)
+ poke ((p `plusPtr` 40 :: Ptr CFloat)) (CFloat (zero))
f
instance FromCStruct AllocationCreateInfo where
@@ -3825,11 +3861,12 @@
memoryTypeBits <- peek @Word32 ((p `plusPtr` 16 :: Ptr Word32))
pool <- peek @Pool ((p `plusPtr` 24 :: Ptr Pool))
pUserData <- peek @(Ptr ()) ((p `plusPtr` 32 :: Ptr (Ptr ())))
+ priority <- peek @CFloat ((p `plusPtr` 40 :: Ptr CFloat))
pure $ AllocationCreateInfo
- flags usage requiredFlags preferredFlags memoryTypeBits pool pUserData
+ flags usage requiredFlags preferredFlags memoryTypeBits pool pUserData (coerce @CFloat @Float priority)
instance Storable AllocationCreateInfo where
- sizeOf ~_ = 40
+ sizeOf ~_ = 48
alignment ~_ = 8
peek = peekCStruct
poke ptr poked = pokeCStruct ptr poked (pure ())
@@ -3843,6 +3880,7 @@
zero
zero
zero
+ zero
type PoolCreateFlags = PoolCreateFlagBits
@@ -3973,6 +4011,13 @@
-- If you want to allow any allocations other than used in the current
-- frame to become lost, set this value to 0.
frameInUseCount :: Word32
+ , -- | A floating-point value between 0 and 1, indicating the priority of the
+ -- allocations in this pool relative to other memory allocations.
+ --
+ -- It is used only when 'ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT' flag was
+ -- used during creation of the 'Allocator' object. Otherwise, this variable
+ -- is ignored.
+ priority :: Float
}
deriving (Typeable, Eq)
#if defined(GENERIC_INSTANCES)
@@ -3989,6 +4034,7 @@
poke ((p `plusPtr` 16 :: Ptr CSize)) (CSize (minBlockCount))
poke ((p `plusPtr` 24 :: Ptr CSize)) (CSize (maxBlockCount))
poke ((p `plusPtr` 32 :: Ptr Word32)) (frameInUseCount)
+ poke ((p `plusPtr` 36 :: Ptr CFloat)) (CFloat (priority))
f
cStructSize = 40
cStructAlignment = 8
@@ -3999,6 +4045,7 @@
poke ((p `plusPtr` 16 :: Ptr CSize)) (CSize (zero))
poke ((p `plusPtr` 24 :: Ptr CSize)) (CSize (zero))
poke ((p `plusPtr` 32 :: Ptr Word32)) (zero)
+ poke ((p `plusPtr` 36 :: Ptr CFloat)) (CFloat (zero))
f
instance FromCStruct PoolCreateInfo where
@@ -4009,8 +4056,9 @@
minBlockCount <- peek @CSize ((p `plusPtr` 16 :: Ptr CSize))
maxBlockCount <- peek @CSize ((p `plusPtr` 24 :: Ptr CSize))
frameInUseCount <- peek @Word32 ((p `plusPtr` 32 :: Ptr Word32))
+ priority <- peek @CFloat ((p `plusPtr` 36 :: Ptr CFloat))
pure $ PoolCreateInfo
- memoryTypeIndex flags blockSize (coerce @CSize @Word64 minBlockCount) (coerce @CSize @Word64 maxBlockCount) frameInUseCount
+ memoryTypeIndex flags blockSize (coerce @CSize @Word64 minBlockCount) (coerce @CSize @Word64 maxBlockCount) frameInUseCount (coerce @CFloat @Float priority)
instance Storable PoolCreateInfo where
sizeOf ~_ = 40
@@ -4020,6 +4068,7 @@
instance Zero PoolCreateInfo where
zero = PoolCreateInfo
+ zero
zero
zero
zero