Backed out changeset useVBO fix, 12f94ed4e02b, "LLVertexBuffer only supposed to use sEnableVBOs at moment vert buff is created" for EXT-7835. Will fix soon.

meow-7.2.2
Palmer 2010-06-11 11:34:15 -07:00
parent 0c8164b894
commit 3bb98107a9
1 changed files with 3 additions and 3 deletions

View File

@ -813,7 +813,7 @@ BOOL LLVertexBuffer::useVBOs() const
return FALSE;
}
#endif
return TRUE;
return sEnableVBOs;
}
//----------------------------------------------------------------------------
@ -1177,7 +1177,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
{
if (mGLBuffer)
{
if (useVBOs() && sVBOActive)
if (sEnableVBOs && 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 (useVBOs() && mGLIndices && sIBOActive)
if (sEnableVBOs && mGLIndices && sIBOActive)
{
/*if (sMapped)
{