Fix for useVBOs being busted when sEnableVBOs gets flipped.
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99) (transplanted from 11bf20602885c3d2d42d8a7f7361d2005a708b5c)master
parent
866961d4b3
commit
0c8164b894
|
|
@ -813,7 +813,7 @@ BOOL LLVertexBuffer::useVBOs() const
|
|||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
return sEnableVBOs;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
@ -1177,7 +1177,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
|
|||
{
|
||||
if (mGLBuffer)
|
||||
{
|
||||
if (sEnableVBOs && sVBOActive)
|
||||
if (useVBOs() && sVBOActive)
|
||||
{
|
||||
glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
|
||||
sBindCount++;
|
||||
|
|
@ -1189,7 +1189,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
|
|||
setup = TRUE; // ... or a client memory pointer changed
|
||||
}
|
||||
}
|
||||
if (sEnableVBOs && mGLIndices && sIBOActive)
|
||||
if (useVBOs() && mGLIndices && sIBOActive)
|
||||
{
|
||||
/*if (sMapped)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue