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/VideoBackends | |
| parent | ba2acb872c294a7a01f8d24cd2a8cd9f4ec6f73a (diff) | |
Externals: Update glslang to 16.0.0 and allow using system glslang
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/D3DCommon/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/D3DCommon/Shader.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Metal/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 11 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 ) |