diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-29 09:32:45 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-29 09:32:45 -0700 |
| commit | 981a81e7537038798d412e57166f06217f1d40d0 (patch) | |
| tree | 90b7681def471ba17820bcba88fc2532f0dea346 /indra | |
| parent | b7eabcc7d721a53f4deaf10c3d6b8c8af5ab67b4 (diff) | |
| parent | 4bf2d7b906ee025e94a2e233188934e8f3bf412a (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index f498526367..e3035c7194 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -960,17 +960,6 @@ S32 LLVertexBuffer::determineUsage(S32 usage) } } - if (ret_usage == 0) - { - if (sDisableVBOMapping) - { //always use stream draw if VBO mapping is disabled - ret_usage = GL_STREAM_DRAW_ARB; - } - else - { - ret_usage = GL_DYNAMIC_DRAW_ARB; - } - } return ret_usage; } @@ -1000,8 +989,6 @@ LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage) mMappable(false), mFence(NULL) { - llassert(mUsage != 0); - mMappable = (mUsage == GL_DYNAMIC_DRAW_ARB && !sDisableVBOMapping); //zero out offsets @@ -1547,7 +1534,7 @@ bool LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices) bool LLVertexBuffer::useVBOs() const { //it's generally ineffective to use VBO for things that are streaming on apple - return sEnableVBOs && (mUsage != 0); + return (mUsage != 0); } //---------------------------------------------------------------------------- |