From 3bb98107a9fdb68ba2931fc01d5eaaac97494f75 Mon Sep 17 00:00:00 2001
From: Palmer <palmer@lindenlab.com>
Date: Fri, 11 Jun 2010 11:34:15 -0700
Subject: Backed out changeset useVBO fix, 12f94ed4e02b, "LLVertexBuffer only
supposed to use sEnableVBOs at moment vert buff is created" for EXT-7835.
Will fix soon.
---
indra/llrender/llvertexbuffer.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra')
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 76cd68e246..bf5eda21eb 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -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)
{
--
cgit v1.2.3