From cdc26253344a6a19d201591853cdabe2532e266f Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 17 Sep 2024 17:55:41 -0500
Subject: [PATCH] #2590 Apple silicon pass

---
 indra/newview/featuretable_mac.txt | 14 ++++++++++++--
 indra/newview/llfeaturemanager.cpp |  8 ++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 2e220d2b1c4..06ad730a40e 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 60
+version 61
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -68,7 +68,8 @@ RenderFSAASamples			1	3
 RenderMaxTextureIndex		1	16
 RenderGLContextCoreProfile         1   1
 RenderGLMultiThreadedTextures      1   0
-RenderGLMultiThreadedMedia         1   0
+RenderGLMultiThreadedMedia         1   1
+RenderAppleUseMultGL        1   1
 RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	2
 RenderScreenSpaceReflections 1  1
@@ -381,6 +382,15 @@ list Intel
 RenderAnisotropic			1	0
 RenderFSAASamples			1	0
 
+// AppleGPU and NonAppleGPU can be thought of as Apple silicon vs Intel Mac
+list AppleGPU
+RenderGLMultiThreadedMedia  1   1
+RenderAppleUseMultGL        1   1
+
+list NonAppleGPU
+RenderGLMultiThreadedMedia  1   0
+RenderAppleUseMultGL        1   0
+
 list GL3
 RenderFSAASamples           0   0
 RenderReflectionProbeDetail	0	0
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index aa04221f4b1..3259ea249b4 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -656,6 +656,14 @@ void LLFeatureManager::applyBaseMasks()
     {
         maskFeatures("Intel");
     }
+    if (gGLManager.mIsApple)
+    {
+        maskFeatures("AppleGPU");
+    }
+    else
+    {
+        maskFeatures("NonAppleGPU");
+    }
     if (gGLManager.mGLVersion < 3.f)
     {
         maskFeatures("OpenGLPre30");