diff options
Diffstat (limited to 'media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch')
| -rw-r--r-- | media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch new file mode 100644 index 000000000000..21fe853ce4e1 --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch @@ -0,0 +1,54 @@ +From 700483f5d92de01c1c8f413f8a4172d96684e93e Mon Sep 17 00:00:00 2001 +From: Lenny Komow <lenny@lunarg.com> +Date: Mon, 25 Jun 2018 14:09:51 -0600 +Subject: [PATCH] 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 +--- + CMakeLists.txt | 2 -- + loader/loader.h | 1 + + scripts/dispatch_table_helper_generator.py | 1 + + 3 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b942bd47c..64f498945 100644 +--- 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 0af2abf27..c39c5385e 100644 +--- 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 fba25e55e..1e2412c0c 100644 +--- a/scripts/dispatch_table_helper_generator.py ++++ b/scripts/dispatch_table_helper_generator.py +@@ -113,6 +113,7 @@ def beginFile(self, genOpts): + 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) + |