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

* 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

Vulkan-Docs

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

VulkanHppGenerator.cpp

@@ -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);

samples/01_InitInstance/CMakeLists.txt

@@ -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")

samples/02_EnumerateDevices/CMakeLists.txt

@@ -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")

samples/03_InitDevice/CMakeLists.txt

@@ -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")

samples/04_InitCommandBuffer/CMakeLists.txt

@@ -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")

samples/05_InitSwapchain/CMakeLists.txt

@@ -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")

samples/06_InitDepthBuffer/CMakeLists.txt

@@ -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")

samples/07_InitUniformBuffer/CMakeLists.txt

@@ -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")

samples/CMakeLists.txt

@@ -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 )

vulkan/vulkan.hpp

@@ -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