From 5e5be92d79b6ad49f971e7b2f2ddd359d762c163 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 6 Dec 2021 15:29:34 +0000
Subject: SL-16202 Put Multi-threaded GL behind a feature flag and update
 featuretable (decruftify settings, compatibility pass).

---
 indra/newview/llviewertexture.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/llviewertexture.cpp')

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 37ed2e9f20..1e0dd2df51 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1633,8 +1633,7 @@ void LLViewerFetchedTexture::scheduleCreateTexture()
         if (preCreateTexture())
         {
             mNeedsCreateTexture = TRUE;
-#if LL_WINDOWS //flip to 0 to revert to single-threaded OpenGL texture uploads
-            auto mainq = mMainQueue.lock();
+            auto mainq = LLImageGLThread::sEnabled ? mMainQueue.lock() : nullptr;
             if (mainq)
             {
                 mainq->postTo(
@@ -1660,7 +1659,6 @@ void LLViewerFetchedTexture::scheduleCreateTexture()
                     });
             }
             else
-#endif
             {
                 gTextureList.mCreateTextureList.insert(this);
                 unref();
-- 
cgit v1.2.3