diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
| commit | c3cdb8ced6ad9cedf9a4b37d19d302c59d33d72c (patch) | |
| tree | f0c5484493ffc1319439f31b1df77bf9d818bdbb /indra/llrender/llvertexbuffer.cpp | |
| parent | b89c31052802450ec59fee48ace4c66a713755ab (diff) | |
| parent | aad87303c88458c9db3c312d44e8a4b125de1fe3 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index bf5eda21eb..ae43915a9d 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -61,6 +61,7 @@ BOOL LLVertexBuffer::sVBOActive = FALSE; BOOL LLVertexBuffer::sIBOActive = FALSE; U32 LLVertexBuffer::sAllocatedBytes = 0; BOOL LLVertexBuffer::sMapped = FALSE; +BOOL LLVertexBuffer::sUseStreamDraw = TRUE; std::vector<U32> LLVertexBuffer::sDeleteList; @@ -381,6 +382,11 @@ LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage) : { mUsage = 0 ; } + + if (mUsage == GL_STREAM_DRAW_ARB && !sUseStreamDraw) + { + mUsage = 0; + } S32 stride = calcStride(typemask, mOffsets); |