loader: Rework include dependencies

This change removes the assumption that vk_layer.h will include
vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
in the near future.

Change-Id: I3fed5efbc35781c96aa9d0977d046c8555e04a7c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b942bd47cdfd623b145934ce51ad08d6a0b55547..64f4989457c3ea967d4fd2bf10935eb523c7a5dd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,8 +201,6 @@ if(NOT WIN32)
     endif()
 endif()
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
-
 # uninstall target
 if(NOT TARGET uninstall)
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"

diff --git a/loader/loader.h b/loader/loader.h
index 0af2abf27bb51c6cb9687ffacda3de3a9a68e7d3..c39c5385eff3c12fa761627b29fe766a8ae97e5e 100644 (file)
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -34,6 +34,7 @@
 #include <vulkan/vk_layer.h>
 #include <vulkan/vk_icd.h>
 #include <assert.h>
+#include "vk_layer_dispatch_table.h"
 #include "vk_loader_extensions.h"
 
 #if defined(__GNUC__) && __GNUC__ >= 4

diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
index fba25e55eeb340e2dd11a34ac8b612666467e6ef..1e2412c0c5283fea657b81ae63757e938bae79c0 100644 (file)
--- a/scripts/dispatch_table_helper_generator.py
+++ b/scripts/dispatch_table_helper_generator.py
@@ -113,6 +113,7 @@ class DispatchTableHelperOutputGenerator(OutputGenerator):
         preamble += '#include <vulkan/vulkan.h>\n'
         preamble += '#include <vulkan/vk_layer.h>\n'
         preamble += '#include <string.h>\n'
+        preamble += '#include "vk_layer_dispatch_table.h"\n'
 
         write(copyright, file=self.outFile)
         write(preamble, file=self.outFile)