3rdparty: update glslang submodule

hrydgard · Feb 10, 2025 · d736b3b · d736b3b
1 parent d5bd7d2
commit d736b3b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2448,7 +2448,7 @@ endif()
 #	target_link_libraries(native X11-xcb X11)
 #endif()
 
-set(GlslangLibs glslang OGLCompiler OSDependent SPIRV spirv-cross-glsl)
+set(GlslangLibs glslang OSDependent SPIRV spirv-cross-glsl)
 
 if (ENABLE_SPVREMAPPER)
 	list(APPEND GlslangLibs SPVRemapper)

diff --git a/Common/GPU/Shader.cpp b/Common/GPU/Shader.cpp
@@ -1,4 +1,6 @@
 #include "Common/GPU/Shader.h"
+#include "glslang/Include/ResourceLimits.h"
+#include <cstring>
 
 #ifdef USE_CRT_DBG
 #undef new

diff --git a/Common/GPU/ShaderTranslation.cpp b/Common/GPU/ShaderTranslation.cpp
@@ -40,6 +40,7 @@
 
 #include "Common/GPU/ShaderTranslation.h"
 #include "ext/glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/Public/ShaderLang.h"
 #include "Common/GPU/thin3d.h"
 #include "Common/GPU/Shader.h"
 #include "Common/GPU/OpenGL/GLFeatures.h"

diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp
@@ -26,6 +26,7 @@
 #define SIMULATE_VULKAN_FAILURE 0
 
 #include "ext/glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/Public/ShaderLang.h"
 
 #ifdef USE_CRT_DBG
 #define new DBG_NEW

diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj b/UWP/glslang_UWP/glslang_UWP.vcxproj
@@ -151,7 +151,6 @@
     <ClInclude Include="..\..\ext\glslang\glslang\HLSL\hlslScanContext.h" />
     <ClInclude Include="..\..\ext\glslang\glslang\HLSL\hlslTokens.h" />
     <ClInclude Include="..\..\ext\glslang\glslang\HLSL\hlslTokenStream.h" />
-    <ClInclude Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.h" />
     <ClInclude Include="..\..\ext\glslang\SPIRV\bitutils.h" />
     <ClInclude Include="..\..\ext\glslang\SPIRV\disassemble.h" />
     <ClInclude Include="..\..\ext\glslang\SPIRV\doc.h" />
@@ -209,7 +208,6 @@
     <ClCompile Include="..\..\ext\glslang\glslang\HLSL\hlslParseHelper.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\HLSL\hlslScanContext.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\HLSL\hlslTokenStream.cpp" />
-    <ClCompile Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.cpp" />
     <ClCompile Include="..\..\ext\glslang\SPIRV\disassemble.cpp" />
     <ClCompile Include="..\..\ext\glslang\SPIRV\doc.cpp" />
     <ClCompile Include="..\..\ext\glslang\SPIRV\GlslangToSpv.cpp" />
@@ -225,4 +223,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj.filters b/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
@@ -160,9 +160,6 @@
     <ClCompile Include="..\..\ext\glslang\glslang\OSDependent\Windows\ossource.cpp">
       <Filter>glslang\OSDependent</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.cpp">
-      <Filter>OGLCompilersDLL</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\attribute.cpp">
       <Filter>glslang\MachineIndependent</Filter>
     </ClCompile>
@@ -334,9 +331,6 @@
     <ClInclude Include="..\..\ext\glslang\glslang\HLSL\hlslTokenStream.h">
       <Filter>hlsl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.h">
-      <Filter>OGLCompilersDLL</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\glslang\glslang\MachineIndependent\attribute.h">
       <Filter>glslang\MachineIndependent</Filter>
     </ClInclude>
@@ -351,4 +345,4 @@
     </ClInclude>
     <ClInclude Include="..\..\ext\glslang\glslang\Include\SpirvIntrinsics.h" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -15,17 +15,14 @@ set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "let's not build binaries we don't ne
 set(SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS ON CACHE BOOL "let's not use exceptions" FORCE)
 set(ENABLE_SPVREMAPPER OFF CACHE BOOL "we don't need spvremapper" FORCE)
 
-# This is really a workaround for an NDK 20 compiler issue (PPSSPP issue #12105), but shouldn't hurt.
-if(ANDROID)
-set(ENABLE_HLSL OFF CACHE BOOL "let's not build HLSL support we don't need" FORCE)
-endif()
-
 # This works around a bug in cpu_features when ${CMAKE_BINARY_DIR} != ${CMAKE_CURRENT_BINRARY_DIR}.
 # We also disable the list_cpu_features binary.
 add_subdirectory(cmake/cpu_features EXCLUDE_FROM_ALL)
 
 set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "" FORCE)
 set(ENABLE_GLSLANG_INSTALL OFF)
+set(ENABLE_HLSL OFF CACHE BOOL "" FORCE)
+set(ENABLE_OPT OFF CACHE BOOL "" FORCE)
 add_subdirectory(glslang EXCLUDE_FROM_ALL)
 add_subdirectory(snappy)
 add_subdirectory(lua-build)

diff --git a/ext/glslang b/ext/glslang
diff --git a/ext/glslang-build/Android.mk b/ext/glslang-build/Android.mk
@@ -53,8 +53,7 @@ LOCAL_SRC_FILES := \
     ../glslang/SPIRV/SpvBuilder.cpp \
     ../glslang/SPIRV/SPVRemapper.cpp \
     ../glslang/SPIRV/SpvPostProcess.cpp \
-    ../glslang/SPIRV/SpvTools.cpp \
-    ../glslang/OGLCompilersDLL/InitializeDll.cpp
+    ../glslang/SPIRV/SpvTools.cpp
 
 
 LOCAL_CFLAGS := -O3 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS -DENABLE_HLSL

diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj
@@ -38,7 +38,7 @@
     <ProjectGuid>{EDFA2E87-8AC1-4853-95D4-D7594FF81947}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>glslang</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -164,6 +164,7 @@
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/libretro/Makefile.common b/libretro/Makefile.common
@@ -571,7 +571,6 @@ SOURCES_CXX += \
 	$(GPUDIR)/GLES/TextureCacheGLES.cpp \
 	$(GPUDIR)/GLES/ShaderManagerGLES.cpp \
 	$(GPUDIR)/GLES/StateMappingGLES.cpp \
-	$(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/Link.cpp \
 	$(EXTDIR)/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp \