Fix for useVBOs being busted when sEnableVBOs gets flipped.
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)master
parent
8cc9e29832
commit
3906a4eb1d
|
|
@ -819,7 +819,7 @@ BOOL LLVertexBuffer::useVBOs() const
|
|||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
return sEnableVBOs;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
@ -1183,7 +1183,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
|
|||
{
|
||||
if (mGLBuffer)
|
||||
{
|
||||
if (sEnableVBOs && sVBOActive)
|
||||
if (useVBOs() && sVBOActive)
|
||||
{
|
||||
glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
|
||||
sBindCount++;
|
||||
|
|
@ -1195,7 +1195,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