From 56d4f2d364e5555b2be4d81364245522ba56a4ea Mon Sep 17 00:00:00 2001
From: Zopolis4 <creatorsmithmdt@gmail.com>
Date: Thu, 8 Sep 2022 14:12:00 +1000
Subject: [PATCH] Remove vulkan-headers submodule

---
 .gitmodules                                          |  3 ---
 CMakeLists.txt                                       |  2 +-
 dependencies/Vulkan-Headers                          |  1 -
 .../HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp    | 12 +-----------
 vcpkg.json                                           |  1 +
 5 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 160000 dependencies/Vulkan-Headers

diff --git a/.gitmodules b/.gitmodules
index dd32088b..04f01186 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ddc6fd..cfd31dea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/dependencies/Vulkan-Headers b/dependencies/Vulkan-Headers
deleted file mode 160000
index 71567370..00000000
--- a/dependencies/Vulkan-Headers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 715673702f5b18ffb8e5832e67cf731468d32ac6
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp
index 7af5204b..206cc147 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp
@@ -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"
diff --git a/vcpkg.json b/vcpkg.json
index 519a5618..3d781f07 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -33,6 +33,7 @@
     "fmt",
     "glm",
     "glslang",
+    "vulkan-headers",
     "zstd",
     {
       "name": "wxwidgets",