diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
commit | 85ccab2d8178c508e585f987bb076951bf2e9ddb (patch) | |
tree | 5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/llrender | |
parent | 9f2a04f217d54344360edc554456d9804e17eeb7 (diff) | |
parent | 6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff) |
Automated merge with file:///Users/oz/Work/viewer-vs2010
Diffstat (limited to 'indra/llrender')
-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 7b5907a668..1beb74eca6 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -310,7 +310,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); |