livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX logic errors in texture batching 

two errors result in poor use of draw buffers when batching alpha textures.
meow-7.2.2
Beq 2022-10-06 22:11:30 +01:00
parent 452f8fd9a0
commit 2cc8e2ba06
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llvovolume.cpp
View File

@ -6643,10 +6643,10 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
LLMaterialPtr mat = te->getMaterialParams();
LLMaterialID matId = te->getMaterialID();
if (distance_sort)
{
tex = NULL;
}
// if (distance_sort)
// {
// tex = NULL;
// }
if (last_tex == tex)
{
@ -6731,7 +6731,11 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
tex = facep->getTexture();
if (texture_count < MAX_TEXTURE_COUNT)
// <FS:Beq> Quick hack test of proper batching logic
// if (texture_count < MAX_TEXTURE_COUNT)
// only add to the batch if this is a new texture
if (cur_tex == texture_count && texture_count < MAX_TEXTURE_COUNT)
// </FS:Beq>
{
texture_list[texture_count++] = tex;
}