mirror of
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
synced 2024-11-21 11:50:04 +00:00
Fixed test not compiling shaders
This commit is contained in:
parent
2683cfedc5
commit
e962c8c83e
@ -17,14 +17,22 @@ foreach(SHADER ${SHADERS})
|
||||
get_filename_component(FILE_NAME ${SHADER} NAME)
|
||||
|
||||
# Put the .spv files into the bin folder
|
||||
set(SPIRV_BIN ${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.spv)
|
||||
set(SPIRV ${PROJECT_SOURCE_DIR}/bin/${FILE_NAME}.spv)
|
||||
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT ${SPIRV}
|
||||
# Use the same file name and append .spv to the compiled shader
|
||||
COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/${SHADER} -o ${SPIRV}
|
||||
DEPENDS ${SHADER}
|
||||
)
|
||||
add_custom_command(
|
||||
OUTPUT ${SPIRV_BIN}
|
||||
# Use the same file name and append .spv to the compiled shader
|
||||
COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/${SHADER} -o ${SPIRV_BIN}
|
||||
DEPENDS ${SHADER}
|
||||
)
|
||||
|
||||
list(APPEND SPIRV_FILES ${SPIRV})
|
||||
endforeach()
|
||||
|
@ -8313,6 +8313,8 @@ static void TestWin32Handles()
|
||||
vmaDestroyBuffer(g_hAllocator, buf, alloc);
|
||||
TEST(CloseHandle(handle));
|
||||
TEST(CloseHandle(handle2));
|
||||
|
||||
vmaDestroyPool(g_hAllocator, pool);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
#pragma comment(lib, "shlwapi.lib")
|
||||
|
||||
static const char* const SHADER_PATH1 = "./";
|
||||
static const char* const SHADER_PATH1 = "./Shaders/";
|
||||
static const char* const SHADER_PATH2 = "../bin/";
|
||||
static const wchar_t* const WINDOW_CLASS_NAME = L"VULKAN_MEMORY_ALLOCATOR_SAMPLE";
|
||||
static const char* const VALIDATION_LAYER_NAME = "VK_LAYER_KHRONOS_validation";
|
||||
@ -1884,7 +1884,7 @@ static void InitializeApplication()
|
||||
else if(strcmp(physicalDeviceExtensionProperties[i].extensionName, VK_KHR_MAINTENANCE_5_EXTENSION_NAME) == 0)
|
||||
VK_KHR_maintenance5_enabled = true;
|
||||
else if (strcmp(physicalDeviceExtensionProperties[i].extensionName, VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME) == 0)
|
||||
VK_KHR_external_memory_win32_enabled = true;
|
||||
VK_KHR_external_memory_win32_enabled = VMA_DYNAMIC_VULKAN_FUNCTIONS;
|
||||
}
|
||||
|
||||
if(GetVulkanApiVersion() >= VK_API_VERSION_1_2)
|
||||
|
Loading…
Reference in New Issue
Block a user