QAR-650 - Viewer RC 9 merge -> release (post cmake)

merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release

1 files changed, 32 insertions, 1 deletions

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 2f053a6493..d79a0d6034 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -38,7 +38,7 @@
 #include "llglheaders.h"
 #include "llmemory.h"
 #include "llmemtype.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 
 //============================================================================
 
@@ -768,11 +768,26 @@ U8* LLVertexBuffer::mapBuffer(S32 access)
 		sMapped = TRUE;*/
 		if (!mMappedData)
 		{
+			GLint buff;
+			glGetIntegerv(GL_ARRAY_BUFFER_BINDING_ARB, &buff);
+			if (buff != mGLBuffer)
+			{
+				llerrs << "Invalid GL vertex buffer bound: " << buff << llendl;
+			}
+
+			
 			llerrs << "glMapBuffer returned NULL (no vertex data)" << llendl;
 		}
 
 		if (!mMappedIndexData)
 		{
+			GLint buff;
+			glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, &buff);
+			if (buff != mGLIndices)
+			{
+				llerrs << "Invalid GL index buffer bound: " << buff << llendl;
+			}
+
 			llerrs << "glMapBuffer returned NULL (no index data)" << llendl;
 		}
 
@@ -952,6 +967,22 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
 			sIBOActive = TRUE;
 		}
 		
+		if (gDebugGL)
+		{
+			GLint buff;
+			glGetIntegerv(GL_ARRAY_BUFFER_BINDING_ARB, &buff);
+			if (buff != mGLBuffer)
+			{
+				llerrs << "Invalid GL vertex buffer bound: " << buff << llendl;
+			}
+
+			glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, &buff);
+			if (buff != mGLIndices)
+			{
+				llerrs << "Invalid GL index buffer bound: " << buff << llendl;
+			}
+		}
+
 		if (mResized)
 		{
 			if (gDebugGL)