From 2c6f9d0d44a3fd5ccb1866de37a36b350bdb09b4 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 13 Feb 2020 19:02:24 +0100 Subject: [PATCH] meson: Remove generation of unneeded includes vk_dispatch_table_helper.h and vk_layer_dispatch_table.h headers are not used anymore by mesa layer, remove their generation. Remove git modules required only for the generation of above headers. --- .gitmodules | 6 ------ meson.build | 11 +---------- modules/Vulkan-Docs | 1 - modules/Vulkan-Loader | 1 - 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 160000 modules/Vulkan-Docs delete mode 160000 modules/Vulkan-Loader diff --git a/.gitmodules b/.gitmodules index 3ebd5345..289685cb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ -[submodule "modules/Vulkan-Docs"] - path = modules/Vulkan-Docs - url = https://github.com/KhronosGroup/Vulkan-Docs.git -[submodule "modules/Vulkan-Loader"] - path = modules/Vulkan-Loader - url = https://github.com/KhronosGroup/Vulkan-Loader.git [submodule "modules/ImGui/src"] path = modules/ImGui/src url = https://github.com/flightlessmango/ImGui.git diff --git a/meson.build b/meson.build index 3dfe21de..adb9dae0 100644 --- a/meson.build +++ b/meson.build @@ -184,17 +184,8 @@ endif dep_pthread = cc.find_library('pthread') -vk_api_xml = files('modules/Vulkan-Docs/xml/vk.xml') +vk_api_xml = files('modules/Vulkan-Headers/registry/vk.xml') vk_layer_table_helpers = [] -loader_genvk_py = files('modules/Vulkan-Loader/scripts/loader_genvk.py') -foreach s : ['vk_dispatch_table_helper.h', 'vk_layer_dispatch_table.h']#, 'vk_loader_extensions.h', 'vk_loader_extensions.c'] - vk_layer_table_helpers += custom_target( - s, output : s, - command : [prog_python, loader_genvk_py, - '-scripts', '../../Vulkan-Docs/scripts', # relative to loader_genvk.py - '-registry', vk_api_xml, - '-o','@OUTDIR@', s]) -endforeach vk_enum_to_str = custom_target( 'vk_enum_to_str', diff --git a/modules/Vulkan-Docs b/modules/Vulkan-Docs deleted file mode 160000 index fbe9fa0b..00000000 --- a/modules/Vulkan-Docs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fbe9fa0b6754ea98fc10df6a372cb5fcb8e565f4 diff --git a/modules/Vulkan-Loader b/modules/Vulkan-Loader deleted file mode 160000 index 44ac9b2f..00000000 --- a/modules/Vulkan-Loader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 44ac9b2f406f863c69a297a77bd23c28fa29e78d