summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-06-04 00:09:52 -0500
committerDave Parks <davep@lindenlab.com>2010-06-04 00:09:52 -0500
commita4ce5c9eaa0d69ff7acf5fb710f0b9a601fb2a75 (patch)
tree3e4aeca30e8e157bf73ca41b808dfaf1da6d966b
parent64d51dbc4482c12bc1ae56598b924cfe6f0ff0e9 (diff)
Fix for useVBOs being busted when sEnableVBOs gets flipped.
-rw-r--r--indra/llrender/llvertexbuffer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 7f14a8d5ac..4f2dae0cdf 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -900,7 +900,7 @@ BOOL LLVertexBuffer::useVBOs() const
return FALSE;
}
#endif
- return sEnableVBOs;
+ return TRUE;
}
//----------------------------------------------------------------------------
@@ -1317,7 +1317,7 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
{
if (mGLBuffer)
{
- if (sEnableVBOs && sVBOActive)
+ if (useVBOs() && sVBOActive)
{
glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
sBindCount++;
@@ -1329,7 +1329,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)
{