diff options
| author | Joshua Vandaële <joshua@vandaele.software> | 2025-09-27 05:12:07 +0200 |
|---|---|---|
| committer | Joshua Vandaële <joshua@vandaele.software> | 2025-09-27 08:56:10 +0200 |
| commit | cdfb389509b560b4a70661571d12edcebfb77fdf (patch) | |
| tree | 1f55476ecef1fafdad01bcfa020343a294c6eb2d /Source/Core/VideoCommon | |
| parent | ba2acb872c294a7a01f8d24cd2a8cd9f4ec6f73a (diff) | |
Externals: Update glslang to 16.0.0 and allow using system glslang
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Spirv.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Spirv.h | 2 |
3 files changed, 4 insertions, 15 deletions
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" |