diff options
| author | prep <prep@lindenlab.com> | 2011-03-10 12:10:29 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-03-10 12:10:29 -0500 |
| commit | 55dbd0c4f3c1cc3598d3d8428dea4a2645b211c4 (patch) | |
| tree | b7b67fd048fda99511042040cf91ac2ae309e728 /indra/llrender/llvertexbuffer.cpp | |
| parent | 79664c1017175b2cdfdc4b16c5894bdfdf6e8188 (diff) | |
| parent | ca610bfc82e9f150877efa7e8c4e972d47bce7d4 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 378147eadc..0d3f5b81bc 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -354,7 +354,18 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const //static void LLVertexBuffer::initClass(bool use_vbo, bool no_vbo_mapping) { - sEnableVBOs = use_vbo; + sEnableVBOs = use_vbo && gGLManager.mHasVertexBufferObject ; + if(sEnableVBOs) + { + //llassert_always(glBindBufferARB) ; //double check the extention for VBO is loaded. + + llinfos << "VBO is enabled." << llendl ; + } + else + { + llinfos << "VBO is disabled." << llendl ; + } + sDisableVBOMapping = sEnableVBOs && no_vbo_mapping ; LLGLNamePool::registerPool(&sDynamicVBOPool); LLGLNamePool::registerPool(&sDynamicIBOPool); |