diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-20 14:45:01 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-20 14:45:01 +0100 |
commit | 34dea8e38f88007799629d0a56b12dec480b1d21 (patch) | |
tree | 6790873994b58030360328cf5897d934b3b03d16 /games-strategy/0ad/files | |
parent | 7932d472a02d4c016ff7dff4b7a5479ab9d1883d (diff) |
gentoo resync : 20.06.2021
Diffstat (limited to 'games-strategy/0ad/files')
-rw-r--r-- | games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch new file mode 100644 index 000000000000..fe054eccac51 --- /dev/null +++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch @@ -0,0 +1,98 @@ +# Nils Freydank <holgersson@posteo.de> (2021-06-17)
+Apply the patch from upstream with minor adoption.
+
+Gentoo bug: https://bugs.gentoo.org/779757
+Upstream Bug: https://trac.wildfiregames.com/ticket/6107
+Upstream Patch: https://trac.wildfiregames.com/changeset/25766
+
+--- a/source/graphics/TextureConverter.cpp (revision 25765)
++++ b/source/graphics/TextureConverter.cpp (revision 25766)
+@@ -294,9 +294,8 @@
+ m_VFS(vfs), m_HighQuality(highQuality), m_Shutdown(false)
+ {
++#if CONFIG2_NVTT
+ // Verify that we are running with at least the version we were compiled with,
+ // to avoid bugs caused by ABI changes
+-#if CONFIG2_NVTT
+ ENSURE(nvtt::version() >= NVTT_VERSION);
+-#endif
+
+ m_WorkerThread = std::thread(Threading::HandleExceptions<RunThread>::Wrapper, this);
+@@ -304,8 +303,10 @@
+ // Maybe we should share some centralised pool of worker threads?
+ // For now we'll just stick with a single thread for this specific use.
++#endif // CONFIG2_NVTT
+ }
+
+ CTextureConverter::~CTextureConverter()
+ {
++#if CONFIG2_NVTT
+ // Tell the thread to shut down
+ {
+@@ -327,4 +328,5 @@
+ // Wait for it to shut down cleanly
+ m_WorkerThread.join();
++#endif // CONFIG2_NVTT
+ }
+
+@@ -477,8 +479,8 @@
+ return true;
+
+-#else
++#else // CONFIG2_NVTT
+ LOGERROR("Failed to convert texture \"%s\" (NVTT not available)", src.string8());
+ return false;
+-#endif
++#endif // !CONFIG2_NVTT
+ }
+
+@@ -529,22 +531,24 @@
+ return true;
+
+-#else // #if CONFIG2_NVTT
++#else // CONFIG2_NVTT
+ return false;
+-#endif
++#endif // !CONFIG2_NVTT
+ }
+
+ bool CTextureConverter::IsBusy()
+ {
++#if CONFIG2_NVTT
+ std::lock_guard<std::mutex> lock(m_WorkerMutex);
+ return !m_RequestQueue.empty();
++#else // CONFIG2_NVTT
++ return false;
++#endif // !CONFIG2_NVTT
+ }
+
+ void CTextureConverter::RunThread(CTextureConverter* textureConverter)
+ {
++#if CONFIG2_NVTT
+ debug_SetThreadName("TextureConverter");
+ g_Profiler2.RegisterCurrentThread("texconv");
+-
+-#if CONFIG2_NVTT
+-
+ // Wait until the main thread wakes us up
+ while (true)
+@@ -596,4 +600,4 @@
+ std::lock_guard<std::mutex> wait_lock(textureConverter->m_WorkerMutex);
+ textureConverter->m_Shutdown = false;
+-#endif
+-}
++#endif // CONFIG2_NVTT
++}
+
+--- a/source/graphics/TextureConverter.h (revision 25765)
++++ b/source/graphics/TextureConverter.h (revision 25766)
+@@ -208,7 +208,9 @@
+ bool m_HighQuality;
+
++#if CONFIG2_NVTT
+ std::thread m_WorkerThread;
+ std::mutex m_WorkerMutex;
+ std::condition_variable m_WorkerCV;
++#endif // CONFIG2_NVTT
+
+ struct ConversionRequest;
|