From c0c4b24466ec96a8a1d33a3a51a09e0b330a3d1f Mon Sep 17 00:00:00 2001
From: oltolm <oleg.tolmatcev@gmail.com>
Date: Tue, 26 Mar 2024 00:58:22 +0100
Subject: [PATCH] 3rdparty: update glslang

---
 CMakeLists.txt                              | 2 +-
 Common/GPU/Shader.cpp                       | 2 ++
 Common/GPU/ShaderTranslation.cpp            | 1 +
 Common/GPU/Vulkan/VulkanContext.cpp         | 1 +
 UWP/glslang_UWP/glslang_UWP.vcxproj         | 4 +---
 UWP/glslang_UWP/glslang_UWP.vcxproj.filters | 8 +-------
 ext/CMakeLists.txt                          | 4 ++++
 ext/glslang                                 | 2 +-
 ext/glslang-build/Android.mk                | 3 +--
 libretro/Makefile.common                    | 1 -
 10 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1194fec7a3a0..f6cf703e4383 100644
--- 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
index 1310c96118d8..f1a551a8f62f 100644
--- 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
index ad8c1ee76b5f..a84fe0679b70 100644
--- 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
index d68776ed8d11..ec9c592286cf 100644
--- 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
index efef2fce694b..de05045aca31 100644
--- 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>
\ No newline at end of file
+</Project>
diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj.filters b/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
index bff8201bc450..2436183aa476 100644
--- 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>
\ No newline at end of file
+</Project>
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index a6e06e112d13..1b31bfe80eee 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -26,6 +26,10 @@ add_subdirectory(cmake/cpu_features EXCLUDE_FROM_ALL)
 
 set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "" FORCE)
 set(ENABLE_GLSLANG_INSTALL OFF)
+set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "Skip spirv-tools install" FORCE)
+set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers" CACHE STRING "SPIRV-Headers path" FORCE)
+option(SPIRV_SKIP_EXECUTABLES "Skip building the executable and tests along with the library" ON)
+add_subdirectory(SPIRV-Tools EXCLUDE_FROM_ALL)
 add_subdirectory(glslang EXCLUDE_FROM_ALL)
 add_subdirectory(snappy)
 add_subdirectory(lua-build)
diff --git a/ext/glslang b/ext/glslang
index b34f619e1c85..46ef757e048e 160000
--- a/ext/glslang
+++ b/ext/glslang
@@ -1 +1 @@
-Subproject commit b34f619e1c85810dcb3c578107d2e48ba4ee2b37
+Subproject commit 46ef757e048e760b46601e6e77ae0cb72c97bd2f
diff --git a/ext/glslang-build/Android.mk b/ext/glslang-build/Android.mk
index a08eaf0ec52c..48b672479942 100644
--- 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/libretro/Makefile.common b/libretro/Makefile.common
index d58bc1e4bc09..b9d108f161ce 100644
--- 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 \