Skip to content

Commit cd269ab

Browse files
committed
Merge remote-tracking branch 'origin/release/2024.09-ExtraFPS' into develop (#3300)
# Conflicts: # .github/workflows/build.yaml
2 parents 6ee71e7 + bb5fa35 commit cd269ab

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

indra/llrender/llimagegl.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2434,7 +2434,9 @@ bool LLImageGL::scaleDown(S32 desired_discard)
24342434
{
24352435
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
24362436

2437-
if (mTarget != GL_TEXTURE_2D)
2437+
if (mTarget != GL_TEXTURE_2D
2438+
|| mFormatInternal == -1 // not initialized
2439+
)
24382440
{
24392441
return false;
24402442
}

indra/newview/featuretable_mac.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version 71
1+
version 72
22
// The version number above should be incremented IF AND ONLY IF some
33
// change has been made that is sufficiently important to justify
44
// resetting the graphics preferences of all users to the recommended
@@ -85,6 +85,7 @@ RenderExposure 1 1
8585
RenderTonemapType 1 1
8686
RenderTonemapMix 1 1
8787
RenderDisableVintageMode 1 1
88+
RenderDownScaleMethod 1 0
8889

8990
//
9091
// Low Graphics Settings
@@ -415,6 +416,7 @@ RenderTerrainPBRDetail 1 -1
415416
list AMD
416417
UseOcclusion 1 0
417418
RenderGLMultiThreadedTextures 1 0
419+
RenderGLMultiThreadedMedia 1 0
418420

419421
list NVIDIA
420422
RenderGLMultiThreadedTextures 1 0

0 commit comments

Comments
 (0)