diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 18fafa201c..4e2658dcdc 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -2537,7 +2537,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; } diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index cfc1ea8f42..eedce61509 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 @@ -408,6 +409,7 @@ RenderTerrainPBRDetail 1 -1 list AMD UseOcclusion 1 0 RenderGLMultiThreadedTextures 1 0 +RenderGLMultiThreadedMedia 1 0 list NVIDIA RenderGLMultiThreadedTextures 1 0 |