From e097f194d9acb06172f480f747d3bf7a77da1b84 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 16 Dec 2024 10:18:29 -0800
Subject: #3293 Disable multi-threaded media updates on AMD on OS X, explicitly
 set downscale method to 0 (FBO) (#3294)

---
 indra/newview/featuretable_mac.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index a0af98a451..cfcd96d650 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 71
+version 72
 // 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
@@ -84,6 +84,7 @@ RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   1
 RenderDisableVintageMode           1   1
+RenderDownScaleMethod       1   0
 
 //
 // Low Graphics Settings
@@ -407,6 +408,7 @@ RenderTerrainPBRDetail      1   -1
 list AMD
 UseOcclusion                    1   0
 RenderGLMultiThreadedTextures   1   0
+RenderGLMultiThreadedMedia      1   0
 
 list NVIDIA
 RenderGLMultiThreadedTextures   1   0
-- 
cgit v1.2.3


From a66ec26b814f832ff40e5e8100f0b90822ef4858 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 00:21:42 +0200
Subject: #3295 Crash scaling texture down (#3296)

---
 indra/llrender/llimagegl.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 5ac3243fd4..3858811a50 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -2434,7 +2434,9 @@ bool LLImageGL::scaleDown(S32 desired_discard)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
 
-    if (mTarget != GL_TEXTURE_2D)
+    if (mTarget != GL_TEXTURE_2D
+        || mFormatInternal == -1 // not initialized
+        )
     {
         return false;
     }
-- 
cgit v1.2.3


From bb5fa35900e52ed34d0bf2cab1fbc9883abaa2a3 Mon Sep 17 00:00:00 2001
From: Brad Linden <46733234+brad-linden@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:41:39 -0800
Subject: Roll back to Xcode 14.0.1 to fix secondlife/viewer-private#347
 (#3297)

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 57e86ad8f6..7d6bcd2bc4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
     needs: setup
     strategy:
       matrix:
-        runner: [windows-large, macos-13-xlarge]
+        runner: [windows-large, macos-12-large]
         configuration: ${{ fromJSON(needs.setup.outputs.configurations) }}
     runs-on: ${{ matrix.runner }}
     outputs:
@@ -64,7 +64,7 @@ jobs:
       # autobuild-package.xml.
       AUTOBUILD_VCS_INFO: "true"
       AUTOBUILD_VSVER: "170"
-      DEVELOPER_DIR: "/Applications/Xcode_14.1.app/Contents/Developer"
+      DEVELOPER_DIR: "/Applications/Xcode_14.0.1.app/Contents/Developer"
       # Ensure that Linden viewer builds engage Bugsplat.
       BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }}
       build_coverity: false
-- 
cgit v1.2.3