diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2023-05-22 18:19:14 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2023-10-13 10:33:18 -0700 |
| commit | cbf202d6324dfe67218e3a0d20ec1589f2906517 (patch) | |
| tree | ac18e1b1d2b91b9d68eb3d1e4b5269c5724419a7 /indra/newview | |
| parent | dfa19c5e436edb102d8bd121c853153303631b4d (diff) | |
SL-19750: Only disable PBR terrain emissive for machines that have a limit of 16 texture binds. Bump featuretable
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/featuretable.txt | 5 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 6 | ||||
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index b8e8cffed8..cb941b424b 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,4 @@ -version 58 +version 59 // 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 @@ -313,7 +313,6 @@ RenderAnisotropic 1 0 RenderFSAASamples 1 0 RenderGLContextCoreProfile 1 0 RenderGLMultiThreadedMedia 1 0 -RenderTerrainPBRDetail 1 -1 list AMD RenderGLMultiThreadedTextures 1 1 @@ -323,3 +322,5 @@ RenderFSAASamples 0 0 RenderReflectionsEnabled 0 0 RenderReflectionProbeDetail 0 0 +list TexUnit16orLess +RenderTerrainPBRDetail 1 -1 diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index d775f04810..c04c1c9a4f 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 53 +version 54 // 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 @@ -45,7 +45,6 @@ RenderObjectBump 1 1 RenderLocalLights 1 1 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 -RenderTerrainPBRDetail 1 -1 RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 RenderVBOEnable 1 1 @@ -309,6 +308,9 @@ RenderShadowDetail 0 0 list TexUnit8orLess RenderDeferredSSAO 0 0 +list TexUnit16orLess +RenderTerrainPBRDetail 1 -1 + list AMD RenderDeferredSSAO 1 0 diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index f482d5a37d..9fff505c2a 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -664,6 +664,10 @@ void LLFeatureManager::applyBaseMasks() { maskFeatures("TexUnit8orLess"); } + if (gGLManager.mNumTextureImageUnits <= 16) + { + maskFeatures("TexUnit16orLess"); + } if (gGLManager.mVRAM > 512) { maskFeatures("VRAMGT512"); |