commit 0b83323dc5f04d23d353a616ae06b077037e73bb
author Geoff Lang <geofflang@google.com> Wed Aug 21 10:13:29 2013 -0400
committer Geoff Lang <geofflang@google.com> Thu Sep 05 17:07:08 2013 -0400
tree 8e2cd939649a8cfb1717caf8cf6fb3f8cd5a13ba
parent da507fea063b882095bd54753cabc685ffdb575d

Perform validation of glClear parameters at the API level.

TRAC #23475

Author: Geoff Lang
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 518cf5b..35580b3 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -825,6 +825,18 @@
 
         if (context)
         {
+            gl::Framebuffer *framebufferObject = context->getDrawFramebuffer();
+
+            if (!framebufferObject || framebufferObject->completeness() != GL_FRAMEBUFFER_COMPLETE)
+            {
+                return gl::error(GL_INVALID_FRAMEBUFFER_OPERATION);
+            }
+
+            if ((mask & ~(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT)) != 0)
+            {
+                return gl::error(GL_INVALID_VALUE);
+            }
+
             context->clear(mask);
         }
     }