From e996ef2b3103f53fbf0ef6adcfabed5d470c08a9 Mon Sep 17 00:00:00 2001
From: asuessenbach <asuessenbach@nvidia.com>
Date: Wed, 21 Oct 2020 10:58:34 +0200
Subject: [PATCH] Correct usage of VulkanRegistry_DIR

---
 CMakeLists.txt    | 6 +++---
 vulkan/vulkan.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb760bb..fc3938c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,12 +56,12 @@ message("CMAKE_CXX_STANDARD = <${CMAKE_CXX_STANDARD}>")
 
 if (NOT DEFINED VulkanRegistry_DIR)
   if (DEFINED VULKAN_HPP_VULKAN_HEADERS_SRC_DIR)
-    set(VulkanRegistry_DIR ${VULKAN_HPP_VULKAN_HEADERS_SRC_DIR})
+    set(VulkanRegistry_DIR "${VULKAN_HPP_VULKAN_HEADERS_SRC_DIR/registry"})
   else()
-    set(VulkanRegistry_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
+    set(VulkanRegistry_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/registry")
   endif()
 endif()
-file(TO_NATIVE_PATH ${VulkanRegistry_DIR}/registry/vk.xml vk_spec)
+file(TO_NATIVE_PATH ${VulkanRegistry_DIR}/vk.xml vk_spec)
 string(REPLACE "\\" "\\\\" vk_spec ${vk_spec})
 add_definitions(-DVK_SPEC="${vk_spec}")
 
diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
index 854b8d8..ed7cfcf 100644
--- a/vulkan/vulkan.hpp
+++ b/vulkan/vulkan.hpp
@@ -543,7 +543,7 @@ namespace VULKAN_HPP_NAMESPACE
       return std::array<T, N>::operator[]( index );
     }
 
-    VULKAN_HPP_CONSTEXPR T & operator[]( int index ) VULKAN_HPP_NOEXCEPT
+    T & operator[]( int index ) VULKAN_HPP_NOEXCEPT
     {
       return std::array<T, N>::operator[]( index );
     }