Externals: Update glslang to 16.0.0 and allow using system glslang

This commit is contained in:
Joshua Vandaële
2025-09-27 08:56:10 +02:00
parent ba2acb872c
commit cdfb389509
11 changed files with 20 additions and 29 deletions
@@ -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)
@@ -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"
@@ -35,6 +35,7 @@ PUBLIC
videocommon
PRIVATE
spirv_cross
glslang::glslang
${FOUNDATION_LIBRARY}
${METAL_LIBRARY}
${QUARTZCORE_LIBRARY}
@@ -44,7 +44,7 @@ PUBLIC
PRIVATE
# Link against glslang, the other necessary libraries are referenced by the executable.
glslang
glslang::glslang
xxhash::xxhash
)
+1 -11
View File
@@ -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)
+2 -3
View File
@@ -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"
+1 -1
View File
@@ -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"