diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:24:07 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:24:07 -0700 |
| commit | 31e16be0daa10e6d66b133c308130524a7a0d881 (patch) | |
| tree | c44a007bc039e07e8ff938898d56a0534347750b /indra/llrender/llvertexbuffer.cpp | |
| parent | 15404a3c5d50f5f106f5bc443d16e172c54e3e0f (diff) | |
| parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
Merge latest from lindenlab/viewer-development
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 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); |