diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
| commit | 57c5d474013793f622ac77a139251a54b056cb00 (patch) | |
| tree | 8cd490d3bb86e74bfcd701ee400bccda74791629 /indra/llrender | |
| parent | d3ca4983a4526c7fcf9eb9609e007ded74c47c05 (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
pull 2.5.1 tag back from viewer-release
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); |