2 files changed, 61 insertions, 15 deletions
diff --git a/thirdparty/glslang/patches/fix-mingw-snprintf.patch b/thirdparty/glslang/patches/fix-mingw-snprintf.patch
deleted file mode 100644
index 2a51bc1f22..0000000000
--- a/thirdparty/glslang/patches/fix-mingw-snprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/thirdparty/glslang/glslang/Include/Common.h b/thirdparty/glslang/glslang/Include/Common.h
-index 733a790cfd..2c511bc1c5 100644
---- a/thirdparty/glslang/glslang/Include/Common.h
-+++ b/thirdparty/glslang/glslang/Include/Common.h
-@@ -50,7 +50,9 @@ std::string to_string(const T& val) {
- }
- #endif
- 
--#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || defined MINGW_HAS_SECURE_API
-+// -- GODOT start --
-+#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) /* || defined MINGW_HAS_SECURE_API */
-+// -- GODOT end --
-     #include <basetsd.h>
-     #ifndef snprintf
-     #define snprintf sprintf_s
diff --git a/thirdparty/glslang/patches/unused_cleanup.diff b/thirdparty/glslang/patches/unused_cleanup.diff
new file mode 100644
index 0000000000..3e9a9c23f9
--- /dev/null
+++ b/thirdparty/glslang/patches/unused_cleanup.diff
@@ -0,0 +1,61 @@
+diff --git a/thirdparty/glslang/glslang/OSDependent/Unix/ossource.cpp b/thirdparty/glslang/glslang/OSDependent/Unix/ossource.cpp
+index 81da99c2c4..1cbd616e98 100644
+--- a/thirdparty/glslang/glslang/OSDependent/Unix/ossource.cpp
++++ b/thirdparty/glslang/glslang/OSDependent/Unix/ossource.cpp
+@@ -65,43 +65,6 @@ static void DetachThreadLinux(void *)
+     DetachThread();
+ }
+ 
+-//
+-// Registers cleanup handler, sets cancel type and state, and executes the thread specific
+-// cleanup handler.  This function will be called in the Standalone.cpp for regression
+-// testing.  When OpenGL applications are run with the driver code, Linux OS does the
+-// thread cleanup.
+-//
+-void OS_CleanupThreadData(void)
+-{
+-#if defined(__ANDROID__) || defined(__Fuchsia__)
+-    DetachThreadLinux(NULL);
+-#else
+-    int old_cancel_state, old_cancel_type;
+-    void *cleanupArg = NULL;
+-
+-    //
+-    // Set thread cancel state and push cleanup handler.
+-    //
+-    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancel_state);
+-    pthread_cleanup_push(DetachThreadLinux, (void *) cleanupArg);
+-
+-    //
+-    // Put the thread in deferred cancellation mode.
+-    //
+-    pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &old_cancel_type);
+-
+-    //
+-    // Pop cleanup handler and execute it prior to unregistering the cleanup handler.
+-    //
+-    pthread_cleanup_pop(1);
+-
+-    //
+-    // Restore the thread's previous cancellation mode.
+-    //
+-    pthread_setcanceltype(old_cancel_state, NULL);
+-#endif
+-}
+-
+ //
+ // Thread Local Storage Operations
+ //
+diff --git a/thirdparty/glslang/glslang/OSDependent/osinclude.h b/thirdparty/glslang/glslang/OSDependent/osinclude.h
+index 218abe4f23..fcfeff2cc4 100644
+--- a/thirdparty/glslang/glslang/OSDependent/osinclude.h
++++ b/thirdparty/glslang/glslang/OSDependent/osinclude.h
+@@ -54,8 +54,6 @@ void ReleaseGlobalLock();
+ 
+ typedef unsigned int (*TThreadEntrypoint)(void*);
+ 
+-void OS_CleanupThreadData(void);
+-
+ void OS_DumpMemoryCounters();
+ 
+ } // end namespace glslang