Skip to content

Commit

Permalink
Update VMA
Browse files Browse the repository at this point in the history
Fixes some "missing include" errors on Linux.
  • Loading branch information
pixelcluster authored and sultim-t committed Nov 26, 2023
1 parent 277ccd4 commit 1a278aa
Show file tree
Hide file tree
Showing 3 changed files with 16,042 additions and 15,565 deletions.
8 changes: 1 addition & 7 deletions Source/MemoryAllocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ RTGL1::MemoryAllocator::MemoryAllocator( VkInstance _inst
// dedicated allocation
.physicalDevice = physDevice->Get(),
.device = device,
.frameInUseCount = MAX_FRAMES_IN_FLIGHT,
.instance = _instance,
.vulkanApiVersion = VK_API_VERSION_1_2,
};
Expand Down Expand Up @@ -187,11 +186,9 @@ void RTGL1::MemoryAllocator::CreateTexturesStagingPool()
VK_CHECKERROR( r );

VmaPoolCreateInfo poolInfo = {};
poolInfo.frameInUseCount = MAX_FRAMES_IN_FLIGHT;
poolInfo.memoryTypeIndex = memTypeIndex;
poolInfo.blockSize = ALLOCATOR_BLOCK_SIZE_STAGING_TEXTURES;
// buddy algorithm as textures has commonly a size of power of 2
poolInfo.flags = VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT;


r = vmaCreatePool( allocator, &poolInfo, &texturesStagingPool );
VK_CHECKERROR( r );
Expand Down Expand Up @@ -228,10 +225,7 @@ void RTGL1::MemoryAllocator::CreateTexturesFinalPool()

VmaPoolCreateInfo poolInfo = {
.memoryTypeIndex = memTypeIndex,
// buddy algorithm as textures has commonly a size of power of 2
.flags = VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT,
.blockSize = ALLOCATOR_BLOCK_SIZE_TEXTURES,
.frameInUseCount = MAX_FRAMES_IN_FLIGHT,
};

r = vmaCreatePool( allocator, &poolInfo, &texturesFinalPool );
Expand Down
2 changes: 1 addition & 1 deletion Source/Vma/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2017-2020 Advanced Micro Devices, Inc. All rights reserved.
Copyright (c) 2017-2022 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
Expand Down
Loading

0 comments on commit 1a278aa

Please sign in to comment.