Externals: Update glslang to 16.0.0 and allow using system glslang

7 files changed, 9 insertions, 26 deletions

diff --git a/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt b/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt
index 3baca1a44d..18a033f0cb 100644
--- a/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt
+++ b/Source/Core/VideoBackends/D3DCommon/CMakeLists.txt
@@ -12,15 +12,8 @@ PUBLIC
   common
   videocommon
   spirv_cross
-)
-
-target_include_directories(videod3dcommon
-SYSTEM PUBLIC
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/Public
-SYSTEM PRIVATE
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/StandAlone
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV
-  ${CMAKE_SOURCE_DIR}/Externals/glslang
+PRIVATE
+  glslang::glslang
 )
 
 if(MSVC)
diff --git a/Source/Core/VideoBackends/D3DCommon/Shader.cpp b/Source/Core/VideoBackends/D3DCommon/Shader.cpp
index 1be4b2298e..369af7c8a1 100644
--- a/Source/Core/VideoBackends/D3DCommon/Shader.cpp
+++ b/Source/Core/VideoBackends/D3DCommon/Shader.cpp
@@ -8,8 +8,8 @@
 #include <string_view>
 
 #include <fmt/format.h>
+#include <glslang/SPIRV/disassemble.h>
 #include <wrl/client.h>
-#include "disassemble.h"
 #include "spirv_hlsl.hpp"
 
 #include "Common/Assert.h"
diff --git a/Source/Core/VideoBackends/Metal/CMakeLists.txt b/Source/Core/VideoBackends/Metal/CMakeLists.txt
index db633a0380..0aaf79bfd1 100644
--- a/Source/Core/VideoBackends/Metal/CMakeLists.txt
+++ b/Source/Core/VideoBackends/Metal/CMakeLists.txt
@@ -35,6 +35,7 @@ PUBLIC
   videocommon
 PRIVATE
   spirv_cross
+  glslang::glslang
   ${FOUNDATION_LIBRARY}
   ${METAL_LIBRARY}
   ${QUARTZCORE_LIBRARY}
diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt
index c4fbd847e1..c717488c83 100644
--- a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt
+++ b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt
@@ -44,7 +44,7 @@ PUBLIC
 
 PRIVATE
   # Link against glslang, the other necessary libraries are referenced by the executable.
-  glslang
+  glslang::glslang
   xxhash::xxhash
 )
 
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 0ead1af2f8..ae9aafbbba 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -224,7 +224,7 @@ PRIVATE
   xxhash::xxhash
   imgui
   implot
-  glslang
+  glslang::glslang
   tinygltf
 )
 
@@ -267,16 +267,6 @@ if(FFmpeg_FOUND)
   endif()
 endif()
 
-# Silence warnings on glslang by flagging it as a system include
-target_include_directories(videocommon
-SYSTEM PUBLIC
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/glslang/Public
-SYSTEM PRIVATE
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/glslang
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/SPIRV
-  ${CMAKE_SOURCE_DIR}/Externals/glslang/glslang
-)
-
 if(MSVC)
   # Add precompiled header
   target_link_libraries(videocommon PRIVATE use_pch)
diff --git a/Source/Core/VideoCommon/Spirv.cpp b/Source/Core/VideoCommon/Spirv.cpp
index 1ee3d6da2d..59bc872f93 100644
--- a/Source/Core/VideoCommon/Spirv.cpp
+++ b/Source/Core/VideoCommon/Spirv.cpp
@@ -3,9 +3,8 @@
 
 #include "VideoCommon/Spirv.h"
 
-// glslang includes
-#include "GlslangToSpv.h"
-#include "disassemble.h"
+#include <glslang/SPIRV/GlslangToSpv.h>
+#include <glslang/SPIRV/disassemble.h>
 
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
diff --git a/Source/Core/VideoCommon/Spirv.h b/Source/Core/VideoCommon/Spirv.h
index fe75ea0f99..4da7b01c17 100644
--- a/Source/Core/VideoCommon/Spirv.h
+++ b/Source/Core/VideoCommon/Spirv.h
@@ -8,7 +8,7 @@
 #include <string_view>
 #include <vector>
 
-#include "ShaderLang.h"
+#include <glslang/Public/ShaderLang.h>
 
 #include "Common/CommonTypes.h"
 #include "VideoCommon/VideoCommon.h"