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/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 69d2b23..eff73bb 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2459,15 +2459,7 @@
 
 void Context::clear(GLbitfield mask)
 {
-    Framebuffer *framebufferObject = getDrawFramebuffer();
-
-    if (!framebufferObject || framebufferObject->completeness() != GL_FRAMEBUFFER_COMPLETE)
-    {
-        return gl::error(GL_INVALID_FRAMEBUFFER_OPERATION);
-    }
-
     ClearParameters clearParams = { 0 };
-
     for (unsigned int i = 0; i < ArraySize(clearParams.clearColor); i++)
     {
         clearParams.clearColor[i] = false;
@@ -2486,10 +2478,9 @@
     clearParams.scissorEnabled = mState.scissorTest;
     clearParams.scissor = mState.scissor;
 
+    Framebuffer *framebufferObject = getDrawFramebuffer();
     if (mask & GL_COLOR_BUFFER_BIT)
     {
-        mask &= ~GL_COLOR_BUFFER_BIT;
-
         if (framebufferObject->hasEnabledColorAttachment())
         {
             for (unsigned int i = 0; i < ArraySize(clearParams.clearColor); i++)
@@ -2501,7 +2492,6 @@
 
     if (mask & GL_DEPTH_BUFFER_BIT)
     {
-        mask &= ~GL_DEPTH_BUFFER_BIT;
         if (mState.depthStencil.depthMask && framebufferObject->getDepthbufferType() != GL_NONE)
         {
             clearParams.clearDepth = true;
@@ -2510,7 +2500,6 @@
 
     if (mask & GL_STENCIL_BUFFER_BIT)
     {
-        mask &= ~GL_STENCIL_BUFFER_BIT;
         if (framebufferObject->getStencilbufferType() != GL_NONE)
         {
             rx::RenderTarget *depthStencil = framebufferObject->getStencilbuffer()->getDepthStencil();
@@ -2527,10 +2516,6 @@
         }
     }
 
-    if (mask != 0)
-    {
-        return gl::error(GL_INVALID_VALUE);
-    }
 
     if (!applyRenderTarget(GL_TRIANGLES, true))   // Clips the clear to the scissor rectangle but not the viewport
     {