File tree Expand file tree Collapse file tree 3 files changed +12
-2
lines changed Expand file tree Collapse file tree 3 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -17,14 +17,22 @@ foreach(SHADER ${SHADERS})
17
17
get_filename_component (FILE_NAME ${SHADER} NAME )
18
18
19
19
# Put the .spv files into the bin folder
20
+ set (SPIRV_BIN ${CMAKE_CURRENT_BINARY_DIR} /${FILE_NAME}.spv )
20
21
set (SPIRV ${PROJECT_SOURCE_DIR} /bin/${FILE_NAME}.spv )
21
22
23
+
22
24
add_custom_command (
23
25
OUTPUT ${SPIRV}
24
26
# Use the same file name and append .spv to the compiled shader
25
27
COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR} /${SHADER} -o ${SPIRV}
26
28
DEPENDS ${SHADER}
27
29
)
30
+ add_custom_command (
31
+ OUTPUT ${SPIRV_BIN}
32
+ # Use the same file name and append .spv to the compiled shader
33
+ COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR} /${SHADER} -o ${SPIRV_BIN}
34
+ DEPENDS ${SHADER}
35
+ )
28
36
29
37
list (APPEND SPIRV_FILES ${SPIRV} )
30
38
endforeach ()
Original file line number Diff line number Diff line change @@ -8313,6 +8313,8 @@ static void TestWin32Handles()
8313
8313
vmaDestroyBuffer (g_hAllocator, buf, alloc);
8314
8314
TEST (CloseHandle (handle));
8315
8315
TEST (CloseHandle (handle2));
8316
+
8317
+ vmaDestroyPool (g_hAllocator, pool);
8316
8318
#endif
8317
8319
}
8318
8320
Original file line number Diff line number Diff line change 32
32
33
33
#pragma comment(lib, "shlwapi.lib")
34
34
35
- static const char * const SHADER_PATH1 = " ./" ;
35
+ static const char * const SHADER_PATH1 = " ./Shaders/ " ;
36
36
static const char * const SHADER_PATH2 = " ../bin/" ;
37
37
static const wchar_t * const WINDOW_CLASS_NAME = L" VULKAN_MEMORY_ALLOCATOR_SAMPLE" ;
38
38
static const char * const VALIDATION_LAYER_NAME = " VK_LAYER_KHRONOS_validation" ;
@@ -1884,7 +1884,7 @@ static void InitializeApplication()
1884
1884
else if (strcmp (physicalDeviceExtensionProperties[i].extensionName , VK_KHR_MAINTENANCE_5_EXTENSION_NAME) == 0 )
1885
1885
VK_KHR_maintenance5_enabled = true ;
1886
1886
else if (strcmp (physicalDeviceExtensionProperties[i].extensionName , VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME) == 0 )
1887
- VK_KHR_external_memory_win32_enabled = true ;
1887
+ VK_KHR_external_memory_win32_enabled = VMA_DYNAMIC_VULKAN_FUNCTIONS ;
1888
1888
}
1889
1889
1890
1890
if (GetVulkanApiVersion () >= VK_API_VERSION_1_2)
You can’t perform that action at this time.
0 commit comments