diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-07-18 16:48:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-18 16:48:33 -0700 |
| commit | ca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (patch) | |
| tree | 82a2b75f4d6ff4650877b774559558065e9ab81a /indra/newview/llvovolume.cpp | |
| parent | 8e3d4048d4197a40009f04169aeb3ec710cd6fa1 (diff) | |
| parent | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (diff) | |
Merge pull request #292 from secondlife/brad/DRTVWR-559-xcode-14.3
Merge xcode-14.3 compatibility branch into DRTVWR-559
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c55254237a..b521dcba5a 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -6196,7 +6196,6 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace LLSpatialGroup::buffer_map_t buffer_map; LLViewerTexture* last_tex = NULL; - S32 buffer_index = 0; S32 texture_index_channels = 1; @@ -6208,8 +6207,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace if (distance_sort) { texture_index_channels = gDeferredAlphaProgram.mFeatures.mIndexedTextureChannels; - buffer_index = -1; - } + } texture_index_channels = LLGLSLShader::sIndexedTextureChannels; @@ -6229,14 +6227,9 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace tex = NULL; } - if (last_tex == tex) - { - buffer_index++; - } - else + if (last_tex != tex) { last_tex = tex; - buffer_index = 0; } bool bake_sunlight = LLPipeline::sBakeSunlight && facep->getDrawable()->isStatic(); |