Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually.

1 files changed, 34 insertions, 126 deletions

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 7a1ccb0cb4..f5e85aecda 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -49,7 +49,6 @@ U32 LLVertexBuffer::sSetCount = 0;
 S32 LLVertexBuffer::sCount = 0;
 S32 LLVertexBuffer::sGLCount = 0;
 S32 LLVertexBuffer::sMappedCount = 0;
-BOOL LLVertexBuffer::sDisableVBOMapping = FALSE ;
 BOOL LLVertexBuffer::sEnableVBOs = TRUE;
 U32 LLVertexBuffer::sGLRenderBuffer = 0;
 U32 LLVertexBuffer::sGLRenderIndices = 0;
@@ -298,7 +297,6 @@ void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indi
 void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const
 {
 	llassert(mRequestedNumIndices >= 0);
-
 	if (indices_offset >= (U32) mRequestedNumIndices ||
 	    indices_offset + count > (U32) mRequestedNumIndices)
 	{
@@ -330,7 +328,6 @@ void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const
 void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const
 {
 	llassert(mRequestedNumVerts >= 0);
-
 	if (first >= (U32) mRequestedNumVerts ||
 	    first + count > (U32) mRequestedNumVerts)
 	{
@@ -354,10 +351,9 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const
 }
 
 //static
-void LLVertexBuffer::initClass(bool use_vbo, bool no_vbo_mapping)
+void LLVertexBuffer::initClass(bool use_vbo)
 {
 	sEnableVBOs = use_vbo;
-	sDisableVBOMapping = sEnableVBOs && no_vbo_mapping ;
 	LLGLNamePool::registerPool(&sDynamicVBOPool);
 	LLGLNamePool::registerPool(&sDynamicIBOPool);
 	LLGLNamePool::registerPool(&sStreamVBOPool);
@@ -501,8 +497,6 @@ LLVertexBuffer::~LLVertexBuffer()
 	destroyGLBuffer();
 	destroyGLIndices();
 	sCount--;
-
-	llassert_always(!mMappedData && !mMappedIndexData) ;
 };
 
 //----------------------------------------------------------------------------
@@ -651,8 +645,6 @@ void LLVertexBuffer::destroyGLBuffer()
 	{
 		if (useVBOs())
 		{
-			freeClientBuffer() ;
-
 			if (mMappedData || mMappedIndexData)
 			{
 				llerrs << "Vertex buffer destroyed while mapped!" << llendl;
@@ -680,13 +672,11 @@ void LLVertexBuffer::destroyGLIndices()
 	{
 		if (useVBOs())
 		{
-			freeClientBuffer() ;
-
 			if (mMappedData || mMappedIndexData)
 			{
 				llerrs << "Vertex buffer destroyed while mapped." << llendl;
 			}
-			releaseIndices();			
+			releaseIndices();
 		}
 		else
 		{
@@ -858,7 +848,6 @@ void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
 
 	if (mResized && useVBOs())
 	{
-		freeClientBuffer() ;
 		setBuffer(0);
 	}
 }
@@ -882,36 +871,6 @@ BOOL LLVertexBuffer::useVBOs() const
 }
 
 //----------------------------------------------------------------------------
-void LLVertexBuffer::freeClientBuffer()
-{
-	if(useVBOs() && sDisableVBOMapping && (mMappedData || mMappedIndexData))
-	{
-		delete[] mMappedData ;
-		delete[] mMappedIndexData ;
-		mMappedData = NULL ;
-		mMappedIndexData = NULL ;
-	}
-}
-
-void LLVertexBuffer::allocateClientVertexBuffer()
-{
-	if(!mMappedData)
-	{
-		U32 size = getSize() ;
-		mMappedData = new U8[size];
-		memset(mMappedData, 0, size);
-	}
-}
-
-void LLVertexBuffer::allocateClientIndexBuffer()
-{
-	if(!mMappedIndexData)
-	{
-		U32 size = getIndicesSize();
-		mMappedIndexData = new U8[size];
-		memset(mMappedIndexData, 0, size);
-	}
-}
 
 // Map for data access
 U8* LLVertexBuffer::mapBuffer(S32 access)
@@ -934,14 +893,10 @@ U8* LLVertexBuffer::mapBuffer(S32 access)
 			mLocked = TRUE;
 			stop_glerror();	
 
-			if(sDisableVBOMapping)
-			{
-				allocateClientVertexBuffer() ;
-			}
-			else
-			{
-				mMappedData = (U8*) glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB);
-			}
+			U8* src = (U8*) glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+			mMappedData = LL_NEXT_ALIGNED_ADDRESS<U8>(src);
+			mAlignedOffset = mMappedData - src;
+			
 			stop_glerror();
 		}
 		{
@@ -950,14 +905,6 @@ U8* LLVertexBuffer::mapBuffer(S32 access)
 			mMappedIndexData = LL_NEXT_ALIGNED_ADDRESS<U8>(src);
 			mAlignedIndexOffset = mMappedIndexData - src;
 
-			if(sDisableVBOMapping)
-			{
-				allocateClientIndexBuffer() ;
-			}
-			else
-			{
-				mMappedIndexData = (U8*) glMapBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB);
-			}
 			stop_glerror();
 		}
 
@@ -971,51 +918,37 @@ U8* LLVertexBuffer::mapBuffer(S32 access)
 			llinfos << "Available physical mwmory(KB): " << avail_phy_mem << llendl ; 
 			llinfos << "Available virtual memory(KB): " << avail_vir_mem << llendl;
 
-			if(!sDisableVBOMapping)
-			{
-				//--------------------
-				//print out more debug info before crash
-				llinfos << "vertex buffer size: (num verts : num indices) = " << getNumVerts() << " : " << getNumIndices() << llendl ;
-				GLint size ;
-				glGetBufferParameterivARB(GL_ARRAY_BUFFER_ARB, GL_BUFFER_SIZE_ARB, &size) ;
-				llinfos << "GL_ARRAY_BUFFER_ARB size is " << size << llendl ;
-				//--------------------
+			//--------------------
+			//print out more debug info before crash
+			llinfos << "vertex buffer size: (num verts : num indices) = " << getNumVerts() << " : " << getNumIndices() << llendl ;
+			GLint size ;
+			glGetBufferParameterivARB(GL_ARRAY_BUFFER_ARB, GL_BUFFER_SIZE_ARB, &size) ;
+			llinfos << "GL_ARRAY_BUFFER_ARB size is " << size << llendl ;
+			//--------------------
 
-				GLint buff;
-				glGetIntegerv(GL_ARRAY_BUFFER_BINDING_ARB, &buff);
-				if ((GLuint)buff != mGLBuffer)
-				{
-					llerrs << "Invalid GL vertex buffer bound: " << buff << llendl;
-				}
-
-				
-				llerrs << "glMapBuffer returned NULL (no vertex data)" << llendl;
-			}
-			else
+			GLint buff;
+			glGetIntegerv(GL_ARRAY_BUFFER_BINDING_ARB, &buff);
+			if ((GLuint)buff != mGLBuffer)
 			{
-				llerrs << "memory allocation for vertex data failed." << llendl ;
+				llerrs << "Invalid GL vertex buffer bound: " << buff << llendl;
 			}
+
+			
+			llerrs << "glMapBuffer returned NULL (no vertex data)" << llendl;
 		}
 
 		if (!mMappedIndexData)
 		{
 			log_glerror();
 
-			if(!sDisableVBOMapping)
-			{
-				GLint buff;
-				glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, &buff);
-				if ((GLuint)buff != mGLIndices)
-				{
-					llerrs << "Invalid GL index buffer bound: " << buff << llendl;
-				}
-
-				llerrs << "glMapBuffer returned NULL (no index data)" << llendl;
-			}
-			else
+			GLint buff;
+			glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, &buff);
+			if ((GLuint)buff != mGLIndices)
 			{
-				llerrs << "memory allocation for Index data failed. " << llendl ;
+				llerrs << "Invalid GL index buffer bound: " << buff << llendl;
 			}
+
+			llerrs << "glMapBuffer returned NULL (no index data)" << llendl;
 		}
 
 		sMappedCount++;
@@ -1031,29 +964,11 @@ void LLVertexBuffer::unmapBuffer()
 	{
 		if (useVBOs() && mLocked)
 		{
-			if(sDisableVBOMapping)
-			{
-				if(mMappedData)
-				{
-					stop_glerror();
-					glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, getSize(), mMappedData);
-					stop_glerror();
-				}
-				if(mMappedIndexData)
-				{
-					stop_glerror();
-					glBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0, getIndicesSize(), mMappedIndexData);
-					stop_glerror();
-				}
-			}
-			else
-			{
-				stop_glerror();
-				glUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
-				stop_glerror();
-				glUnmapBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB);
-				stop_glerror();
-			}
+			stop_glerror();
+			glUnmapBufferARB(GL_ARRAY_BUFFER_ARB);
+			stop_glerror();
+			glUnmapBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB);
+			stop_glerror();
 
 			/*if (!sMapped)
 			{
@@ -1067,22 +982,15 @@ void LLVertexBuffer::unmapBuffer()
 				//throw out client data (we won't be using it again)
 				mEmpty = TRUE;
 				mFinal = TRUE;
-
-				if(sDisableVBOMapping)
-				{
-					freeClientBuffer() ;
-				}
 			}
 			else
 			{
 				mEmpty = FALSE;
 			}
 
-			if(!sDisableVBOMapping)
-			{
-				mMappedIndexData = NULL;
-				mMappedData = NULL;
-			}
+			mMappedIndexData = NULL;
+			mMappedData = NULL;
+			
 			mLocked = FALSE;
 		}
 	}