mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Re-introduce vulkan/vulkan.hpp; adjust include order to use that header in samples and tests (#340)

Browse Source
This commit is contained in:
Andreas Süßenbach 2019-06-11 13:25:36 +02:00 committed by Markus Tavenrath
parent cd6e0a6a89
commit a6ad0f1eff
5 changed files with 57360 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -40,7 +40,7 @@ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/registry/vk.xml v
string(REPLACE "\\" "\\\\" vk_spec ${vk_spec}) string(REPLACE "\\" "\\\\" vk_spec ${vk_spec})
add_definitions(-DVK_SPEC="${vk_spec}") add_definitions(-DVK_SPEC="${vk_spec}")
file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include/vulkan.hpp vulkan_hpp) file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vulkan.hpp vulkan_hpp)
string(REPLACE "\\" "\\\\" vulkan_hpp ${vulkan_hpp}) string(REPLACE "\\" "\\\\" vulkan_hpp ${vulkan_hpp})
add_definitions(-DVULKAN_HPP_FILE="${vulkan_hpp}") add_definitions(-DVULKAN_HPP_FILE="${vulkan_hpp}")

1
VulkanHppGenerator.cpp
View File

@ -5111,6 +5111,7 @@ namespace std
generator.checkCorrectness(); generator.checkCorrectness();
std::ofstream ofs(VULKAN_HPP_FILE); std::ofstream ofs(VULKAN_HPP_FILE);
assert(!ofs.fail());
ofs << generator.getVulkanLicenseHeader() << std::endl ofs << generator.getVulkanLicenseHeader() << std::endl
<< includes << includes
<< std::endl << std::endl

2
samples/CMakeLists.txt
View File

@ -29,8 +29,8 @@ endif()
FILE (GLOB linkunits ${CMAKE_CURRENT_SOURCE_DIR}/*) FILE (GLOB linkunits ${CMAKE_CURRENT_SOURCE_DIR}/*)
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP) if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include")
else() else()
include_directories("${Vulkan_INCLUDE_DIRS}") include_directories("${Vulkan_INCLUDE_DIRS}")
endif() endif()

2
tests/CMakeLists.txt
View File

@ -29,8 +29,8 @@ endif()
FILE (GLOB linkunits ${CMAKE_CURRENT_SOURCE_DIR}/*) FILE (GLOB linkunits ${CMAKE_CURRENT_SOURCE_DIR}/*)
if (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP) if (TESTS_BUILD_WITH_LOCAL_VULKAN_HPP)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include")
else() else()
include_directories("${Vulkan_INCLUDE_DIRS}") include_directories("${Vulkan_INCLUDE_DIRS}")
endif() endif()

57356
vulkan/vulkan.hpp Normal file
View File

File diff suppressed because it is too large Load Diff