diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-05 10:52:04 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-05 10:52:04 -0600 |
| commit | 3799b1bcf325f1519b9dc07c2a0774b8e579bd19 (patch) | |
| tree | d7683e6adf57a6234b5160e6b46ff9b4c8db59ae /indra/llrender/llvertexbuffer.cpp | |
| parent | b27ce5bc88af7195f18b1d8752056d80620be702 (diff) | |
| parent | 988520f3a7d5d5e817326945d8b9c3808c4eb5f7 (diff) | |
merge
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 415d2f603b..4064e688e8 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); |