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

When using local version of vulkan.hpp use local version of vulkan.h … (#207)

Browse Source 
* When using local version of vulkan.hpp use local version of vulkan.h too so that the headers do match.
* Update to Vulkan 1.1.74
This commit is contained in:
Markus Tavenrath 2018-04-23 15:16:32 +02:00 committed by GitHub
parent f54bf98790
commit 4b179131e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vulkan-Docs

@ -1 +1 @@
Subproject commit e1c0e426f37e45705273f2c5b6cbb0a0f74e3d75
Subproject commit c51545d33f4fd791dc4109d0d338e79b572f6286

1
VulkanHppGenerator.cpp
View File

@ -2127,6 +2127,7 @@ void VulkanHppGenerator::readExtensionsExtension(tinyxml2::XMLElement const* ele
{ "platform",{} },
{ "protect",{} },
{ "requires",{} },
{ "requiresCore",{} },
{ "type",{ "device", "instance" } }
});
std::vector<tinyxml2::XMLElement const*> children = getChildElements(element);

6
samples/01_InitInstance/CMakeLists.txt
View File

@ -32,10 +32,4 @@ add_executable(01_InitInstance
)
set_target_properties(01_InitInstance PROPERTIES FOLDER "Samples")
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
target_include_directories(01_InitInstance PUBLIC "${CMAKE_SOURCE_DIR}")
endif()
target_include_directories(01_InitInstance PUBLIC "$ENV{VK_SDK_PATH}/include")
target_link_libraries(01_InitInstance "$ENV{VK_SDK_PATH}/Lib/vulkan-1.lib")

6
samples/02_EnumerateDevices/CMakeLists.txt
View File

@ -32,10 +32,4 @@ add_executable(02_EnumerateDevices
)
set_target_properties(02_EnumerateDevices PROPERTIES FOLDER "Samples")
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
target_include_directories(02_EnumerateDevices PUBLIC "${CMAKE_SOURCE_DIR}")
endif()
target_include_directories(02_EnumerateDevices PUBLIC "$ENV{VK_SDK_PATH}/include")
target_link_libraries(02_EnumerateDevices "$ENV{VK_SDK_PATH}/Lib/vulkan-1.lib")

6
samples/03_InitDevice/CMakeLists.txt
View File

@ -32,10 +32,4 @@ add_executable(03_InitDevice
)
set_target_properties(03_InitDevice PROPERTIES FOLDER "Samples")
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
target_include_directories(03_InitDevice PUBLIC "${CMAKE_SOURCE_DIR}")
endif()
target_include_directories(03_InitDevice PUBLIC "$ENV{VK_SDK_PATH}/include")
target_link_libraries(03_InitDevice "$ENV{VK_SDK_PATH}/Lib/vulkan-1.lib")

6
samples/04_InitCommandBuffer/CMakeLists.txt
View File

@ -32,10 +32,4 @@ add_executable(04_InitCommandBuffer
)
set_target_properties(04_InitCommandBuffer PROPERTIES FOLDER "Samples")
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
target_include_directories(04_InitCommandBuffer PUBLIC "${CMAKE_SOURCE_DIR}")
endif()
target_include_directories(04_InitCommandBuffer PUBLIC "$ENV{VK_SDK_PATH}/include")
target_link_libraries(04_InitCommandBuffer "$ENV{VK_SDK_PATH}/Lib/vulkan-1.lib")

6
samples/05_InitSwapchain/CMakeLists.txt
View File

@ -32,10 +32,4 @@ add_executable(05_InitSwapchain
)
set_target_properties(05_InitSwapchain PROPERTIES FOLDER "Samples")
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
target_include_directories(05_InitSwapchain PUBLIC "${CMAKE_SOURCE_DIR}")
endif()
target_include_directories(05_InitSwapchain PUBLIC "$ENV{VK_SDK_PATH}/include")
target_link_libraries(05_InitSwapchain "$ENV{VK_SDK_PATH}/Lib/vulkan-1.lib")

6
samples/06_InitDepthBuffer/CMakeLists.txt
View File

@ -32,10 +32,4 @@ add_executable(06_InitDepthBuffer
)
set_target_properties(06_InitDepthBuffer PROPERTIES FOLDER "Samples")
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
target_include_directories(06_InitDepthBuffer PUBLIC "${CMAKE_SOURCE_DIR}")
endif()
target_include_directories(06_InitDepthBuffer PUBLIC "$ENV{VK_SDK_PATH}/include")
target_link_libraries(06_InitDepthBuffer "$ENV{VK_SDK_PATH}/Lib/vulkan-1.lib")

6
samples/07_InitUniformBuffer/CMakeLists.txt
View File

@ -32,10 +32,4 @@ add_executable(07_InitUniformBuffer
)
set_target_properties(07_InitUniformBuffer PROPERTIES FOLDER "Samples")
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
target_include_directories(07_InitUniformBuffer PUBLIC "${CMAKE_SOURCE_DIR}")
endif()
target_include_directories(07_InitUniformBuffer PUBLIC "$ENV{VK_SDK_PATH}/include" "${CMAKE_SOURCE_DIR}/glm")
target_link_libraries(07_InitUniformBuffer "$ENV{VK_SDK_PATH}/Lib/vulkan-1.lib")

11
samples/CMakeLists.txt
View File

@ -14,6 +14,8 @@
cmake_minimum_required(VERSION 3.2)
project(Vulkan-Hpp_Samples)
option (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP OFF)
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
@ -24,6 +26,15 @@ endif()
FILE (GLOB linkunits ${CMAKE_CURRENT_SOURCE_DIR}/*)
if (SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Docs/include")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
else()
include_directories("$ENV{VK_SDK_PATH}/include")
endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../glm")
FOREACH( linkunit ${linkunits} )
if( IS_DIRECTORY ${linkunit} )
if( EXISTS ${linkunit}/CMakeLists.txt )

2
vulkan/vulkan.hpp
View File

@ -36,7 +36,7 @@
# include <cassert>
# define VULKAN_HPP_ASSERT assert
#endif
static_assert( VK_HEADER_VERSION == 72 , "Wrong VK_HEADER_VERSION!" );
static_assert( VK_HEADER_VERSION == 74 , "Wrong VK_HEADER_VERSION!" );
// 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default.
// To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION