diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-07-29 16:31:54 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-07-29 16:31:54 +0000 |
| commit | 4bf2d7b906ee025e94a2e233188934e8f3bf412a (patch) | |
| tree | 75238037738160ea77c923756659f0840b7932a5 /indra | |
| parent | b6eabbc4e3b99a07ef5d8cdd3594a97de8ff5ad3 (diff) | |
| parent | 749eae85ce2b40e8d229be0027a940a44278c1b8 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #471)
SL-11661 Backed out part of changeset 3a84abad1d46 to fix uploader crash
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); } //---------------------------------------------------------------------------- |