diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-11-02 10:47:15 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-11-02 10:47:15 -0500 |
| commit | 65fb4e67cb55f048c3ac8d0e46fc585f737c48ad (patch) | |
| tree | 825d4818773ae96d0543daecc9a3aa0ad155dffd /indra/newview | |
| parent | f72309a17eab1be1979c58a135e061ebffc37e21 (diff) | |
SL-19979 Fix for frame stalls on mac with shadows enabled. Also fix multihreaded GL not working on mac (thanks, Rye!)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 6 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 77a9a0d1cf..40aaccc8cb 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 55 +version 56 // 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 @@ -61,7 +61,7 @@ RenderShaderLightingMaxLevel 1 3 RenderDeferred 1 1 RenderDeferredSSAO 1 1 RenderUseAdvancedAtmospherics 1 0 -RenderShadowDetail 1 0 +RenderShadowDetail 1 2 RenderUseStreamVBO 1 1 RenderFSAASamples 1 16 RenderMaxTextureIndex 1 16 @@ -71,7 +71,7 @@ RenderGLMultiThreadedMedia 1 0 RenderReflectionsEnabled 1 1 RenderReflectionProbeDetail 1 2 RenderScreenSpaceReflections 1 1 -RenderReflectionProbeLevel 1 0 +RenderReflectionProbeLevel 1 3 // // Low Graphics Settings diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 61ccc1d43f..cdf5e2875f 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -392,8 +392,8 @@ void LLViewerShaderMgr::setShaders() static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16); - // when using indexed texture rendering, leave 8 texture units available for shadow and reflection maps - LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits-8, (S32) max_texture_index), 1); + // when using indexed texture rendering, leave some texture units available for shadow and reflection maps + LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits-12, (S32) max_texture_index), 1); reentrance = true; |