diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-13 10:07:09 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-13 10:07:09 -0500 |
| commit | c06fd0d753985297105e4656b7e2c39d155ba2b5 (patch) | |
| tree | 5e65a6d5703d84db37a8b1601dce2fc50859ce92 /indra/newview/llvovolume.cpp | |
| parent | 80127acfa876bd98e843a67bd17514a2b3f63d49 (diff) | |
SL-18367 Fix for some objects rendering purple -- globally set number of indexed texture channels instead of allowing it to vary from one shader to the next.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index bbe6814ce1..2a06331b63 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -6464,11 +6464,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace buffer_index = -1; } - static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16); - texture_index_channels = llmin(texture_index_channels, (S32) max_texture_index); - - //NEVER use more than 16 texture index channels (workaround for prevalent driver bug) - texture_index_channels = llmin(texture_index_channels, 16); + texture_index_channels = LLGLSLShader::sIndexedTextureChannels; bool flexi = false; |