From 5a402dbc1f90d3a6fa6a4581cdd7bcf8f0484b8e Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 16 Nov 2017 17:11:48 +0200
Subject: [PATCH] MAINT-7228 Vertex buffer allocation failure handling
---
indra/llrender/llvertexbuffer.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 6de2a973d2d..0b4427a31a3 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -1356,10 +1356,10 @@ bool LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create)
sucsess &= updateNumVerts(nverts);
sucsess &= updateNumIndices(nindices);
- if (sucsess && create && (nverts || nindices))
+ if (create && (nverts || nindices))
{
//actually allocate space for the vertex buffer if using VBO mapping
- flush();
+ flush(); //unmap
if (gGLManager.mHasVertexArrayObject && useVBOs() && sUseVAO)
{
@@ -1502,9 +1502,9 @@ bool LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
sucsess &= updateNumVerts(newnverts);
sucsess &= updateNumIndices(newnindices);
- if (sucsess && useVBOs())
+ if (useVBOs())
{
- flush();
+ flush(); //unmap
if (mGLArray)
{ //if size changed, offsets changed
--
GitLab