Support matrix stack overflow/underflow errors.

src/OpenGL/libGLES_CM/Context.cpp

@@ -162,6 +162,8 @@ Context::Context(const egl::Config *config, const Context *shareContext)
     mInvalidOperation = false;
     mOutOfMemory = false;
     mInvalidFramebufferOperation = false;
+	mMatrixStackOverflow = false;
+	mMatrixStackUnderflow = false;
 
 	lighting = false;
 
@@ -2649,6 +2651,16 @@ void Context::recordInvalidFramebufferOperation()
     mInvalidFramebufferOperation = true;
 }
 
+void Context::recordMatrixStackOverflow()
+{
+    mMatrixStackOverflow = true;
+}
+
+void Context::recordMatrixStackUnderflow()
+{
+    mMatrixStackUnderflow = true;
+}
+
 // Get one of the recorded errors and clear its flag, if any.
 // [OpenGL ES 2.0.24] section 2.5 page 13.
 GLenum Context::getError()
@@ -2688,6 +2700,20 @@ GLenum Context::getError()
         return GL_INVALID_FRAMEBUFFER_OPERATION_OES;
     }
 
+	if(mMatrixStackOverflow)
+    {
+        mMatrixStackOverflow = false;
+
+        return GL_INVALID_FRAMEBUFFER_OPERATION_OES;
+    }
+
+	if(mMatrixStackUnderflow)
+    {
+        mMatrixStackUnderflow = false;
+
+        return GL_INVALID_FRAMEBUFFER_OPERATION_OES;
+    }
+
     return GL_NO_ERROR;
 }
 

src/OpenGL/libGLES_CM/Context.h

@@ -461,6 +461,8 @@ public:
     void recordInvalidOperation();
     void recordOutOfMemory();
     void recordInvalidFramebufferOperation();
+	void recordMatrixStackOverflow();
+	void recordMatrixStackUnderflow();
 
     GLenum getError();
 
@@ -533,6 +535,8 @@ private:
     bool mInvalidOperation;
     bool mOutOfMemory;
     bool mInvalidFramebufferOperation;
+	bool mMatrixStackOverflow;
+	bool mMatrixStackUnderflow;
 
     bool mHasBeenCurrent;
 

src/OpenGL/libGLES_CM/main.cpp

@@ -135,6 +135,14 @@ void error(GLenum errorCode)
             context->recordInvalidFramebufferOperation();
             TRACE("\t! Error generated: invalid framebuffer operation\n");
             break;
+		case GL_STACK_OVERFLOW:
+			context->recordMatrixStackOverflow();
+            TRACE("\t! Error generated: matrix stack overflow\n");
+            break;
+		case GL_STACK_UNDERFLOW:
+			context->recordMatrixStackUnderflow();
+            TRACE("\t! Error generated: matrix stack underflow\n");
+            break;
         default: UNREACHABLE(errorCode);
         }
     }