mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
Correct tests "DeviceFunctions" and "DispatchLoaderStatic" to actually use the static dispatch loader.
This commit is contained in:
parent
9a561fa33f
commit
49b11ea464
@ -15,6 +15,9 @@
|
|||||||
cmake_minimum_required(VERSION 3.2)
|
cmake_minimum_required(VERSION 3.2)
|
||||||
|
|
||||||
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
|
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
|
||||||
|
|
||||||
|
find_package(Vulkan REQUIRED)
|
||||||
|
|
||||||
project(DeviceFunctions)
|
project(DeviceFunctions)
|
||||||
|
|
||||||
set(HEADERS
|
set(HEADERS
|
||||||
@ -33,5 +36,5 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
|
|||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(DeviceFunctions PROPERTIES FOLDER "Tests")
|
set_target_properties(DeviceFunctions PROPERTIES FOLDER "Tests")
|
||||||
target_link_libraries(DeviceFunctions PRIVATE utils)
|
target_link_libraries(DeviceFunctions PRIVATE utils "${Vulkan_LIBRARIES}")
|
||||||
endif()
|
endif()
|
@ -24,6 +24,9 @@
|
|||||||
// unknow compiler... just ignore the warnings for yourselves ;)
|
// unknow compiler... just ignore the warnings for yourselves ;)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#undef VULKAN_HPP_DISPATCH_LOADER_DYNAMIC
|
||||||
|
#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 0
|
||||||
|
|
||||||
#include "vulkan/vulkan.hpp"
|
#include "vulkan/vulkan.hpp"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -16,6 +16,8 @@ cmake_minimum_required(VERSION 3.2)
|
|||||||
|
|
||||||
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
|
if (NOT TESTS_BUILD_ONLY_DYNAMIC)
|
||||||
|
|
||||||
|
find_package(Vulkan REQUIRED)
|
||||||
|
|
||||||
project(DispatchLoaderStatic)
|
project(DispatchLoaderStatic)
|
||||||
|
|
||||||
set(HEADERS
|
set(HEADERS
|
||||||
@ -38,6 +40,6 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(DispatchLoaderStatic PROPERTIES FOLDER "Tests")
|
set_target_properties(DispatchLoaderStatic PROPERTIES FOLDER "Tests")
|
||||||
target_link_libraries(DispatchLoaderStatic PRIVATE utils)
|
target_link_libraries(DispatchLoaderStatic PRIVATE utils "${Vulkan_LIBRARIES}")
|
||||||
|
|
||||||
endif()
|
endif()
|
@ -15,6 +15,9 @@
|
|||||||
// VulkanHpp Samples : DispatchLoaderStatic
|
// VulkanHpp Samples : DispatchLoaderStatic
|
||||||
// Compile test on DispatchLoaderStatic functions
|
// Compile test on DispatchLoaderStatic functions
|
||||||
|
|
||||||
|
#undef VULKAN_HPP_DISPATCH_LOADER_DYNAMIC
|
||||||
|
#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 0
|
||||||
|
|
||||||
#include "vulkan/vulkan.hpp"
|
#include "vulkan/vulkan.hpp"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
Loading…
Reference in New Issue
Block a user