Remove vulkan-headers submodule

This commit is contained in:
Zopolis4 2022-09-08 14:12:00 +10:00
parent 3767257220
commit 56d4f2d364
No known key found for this signature in database
GPG Key ID: C1117D56FBC82774
5 changed files with 3 additions and 16 deletions

3
.gitmodules vendored
View File

@ -10,6 +10,3 @@
path = dependencies/vcpkg
url = https://github.com/microsoft/vcpkg
shallow = true
[submodule "dependencies/Vulkan-Headers"]
path = dependencies/Vulkan-Headers
url = https://github.com/KhronosGroup/Vulkan-Headers

View File

@ -105,7 +105,7 @@ if (UNIX AND NOT APPLE)
endif()
if (ENABLE_VULKAN)
include_directories("dependencies/Vulkan-Headers/include")
find_package(VulkanHeaders REQUIRED)
endif()
if (ENABLE_OPENGL)

@ -1 +0,0 @@
Subproject commit 715673702f5b18ffb8e5832e67cf731468d32ac6

View File

@ -1,18 +1,8 @@
#include "Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h"
#if __has_include(<glslang/build_info.h>)
#include <glslang/build_info.h>
#else
#define GLSLANG_VERSION_LESS_OR_EQUAL_TO (false)
#endif
#include <glslang/Public/ShaderLang.h>
#if GLSLANG_VERSION_LESS_OR_EQUAL_TO(11, 0, 0)
#include <glslang/SPIRV/GlslangToSpv.h>
#else
#include <SPIRV/Logger.h>
#include <SPIRV/GlslangToSpv.h>
#endif
#include <glslang/SPIRV/GlslangToSpv.h>
#include "Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h"

View File

@ -33,6 +33,7 @@
"fmt",
"glm",
"glslang",
"vulkan-headers",
"zstd",
{
"name": "wxwidgets",