Skip to content

Commit 09199d4

Browse files
committed
Update dependencies and remove uniform updateAfterBind bit
1 parent 403db7c commit 09199d4

4 files changed

Lines changed: 20 additions & 9 deletions

File tree

lib/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ FetchContent_MakeAvailable(volk)
2727

2828
set(TINYEXR_BUILD_SAMPLE OFF CACHE BOOL "")
2929
FetchContent_Declare(
30-
tinyexr
31-
GIT_REPOSITORY https://github.com/syoyo/tinyexr.git
32-
GIT_TAG 74d0820a3ec7f67d734fabdb4311ba8dffdde5a7
33-
GIT_SHALLOW ON
30+
tinyexr
31+
GIT_REPOSITORY https://github.com/syoyo/tinyexr.git
32+
GIT_TAG v1.0.1
33+
GIT_SHALLOW ON
3434
)
3535
FetchContent_MakeAvailable(tinyexr)
3636

@@ -39,7 +39,7 @@ set(VMA_DYNAMIC_VULKAN_FUNCTIONS ON CACHE BOOL "")
3939
FetchContent_Declare(
4040
vma
4141
GIT_REPOSITORY https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
42-
GIT_TAG v2.3.0
42+
GIT_TAG v3.0.0
4343
GIT_SHALLOW ON
4444
)
4545
if(NOT vma_POPULATED)
@@ -77,7 +77,7 @@ target_include_directories(
7777
lflop
7878
PUBLIC
7979
${CMAKE_CURRENT_SOURCE_DIR}/../include
80-
${vma_SOURCE_DIR}/src
80+
${vma_SOURCE_DIR}/include
8181
PRIVATE
8282
${stb_SOURCE_DIR}
8383
${tinyexr_SOURCE_DIR}

lib/Flop.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ static int create_device(char const* preferred_device, bool swapchain)
288288
.descriptorIndexing = VK_TRUE,
289289
.shaderSampledImageArrayNonUniformIndexing = VK_TRUE,
290290
.shaderStorageImageArrayNonUniformIndexing = VK_TRUE,
291-
.descriptorBindingUniformBufferUpdateAfterBind = VK_TRUE,
292291
.descriptorBindingSampledImageUpdateAfterBind = VK_TRUE,
293292
.descriptorBindingStorageImageUpdateAfterBind = VK_TRUE,
294293
.descriptorBindingStorageBufferUpdateAfterBind = VK_TRUE,
@@ -325,13 +324,18 @@ static int create_device(char const* preferred_device, bool swapchain)
325324
vkGetDeviceQueue(g_device, g_compute_queue_index, 0, &g_compute_queue);
326325
}
327326

327+
VmaVulkanFunctions vulkan_functions{
328+
.vkGetInstanceProcAddr = vkGetInstanceProcAddr,
329+
.vkGetDeviceProcAddr = vkGetDeviceProcAddr,
330+
};
331+
328332
VmaAllocatorCreateInfo allocator_info{
329333
.physicalDevice = g_physical_device,
330334
.device = g_device,
331335
.preferredLargeHeapBlockSize = 0, // 256 MiB default
332336
.pAllocationCallbacks = nullptr,
333337
.pDeviceMemoryCallbacks = nullptr,
334-
.frameInUseCount = 0,
338+
.pVulkanFunctions = &vulkan_functions,
335339
.instance = g_instance};
336340

337341
if (vmaCreateAllocator(&allocator_info, &g_allocator) != VK_SUCCESS)

lib/VMA.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#define VMA_IMPLEMENTATION
2-
#define VMA_STATIC_VULKAN_FUNCTIONS 1
2+
#define VMA_STATIC_VULKAN_FUNCTIONS 0
3+
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
34
#include <volk.h>
45
#include <vk_mem_alloc.h>

src/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ target_compile_features(
8383
cxx_std_20
8484
)
8585

86+
target_compile_definitions(
87+
flop
88+
PUBLIC
89+
NOMINMAX=1
90+
)
91+
8692
target_link_libraries(
8793
flop
8894
PUBLIC

0 commit comments

Comments
 (0)