diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-04 00:09:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-04 00:09:52 -0500 |
| commit | 0c8164b8947eee7b43ba0452821a3ff6d9f9dd38 (patch) | |
| tree | 4e88dd4b077fea2c439908903c8982c91c9c74eb | |
| parent | 866961d4b3426114c306e158b50fe3a91b45021d (diff) | |
Fix for useVBOs being busted when sEnableVBOs gets flipped.
(transplanted from 19717602f45950c058c8ddce792d57ef21f67c99)
(transplanted from 11bf20602885c3d2d42d8a7f7361d2005a708b5c)
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index bf5eda21eb..76cd68e246 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -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) { |