Changed the Renderer::clear method parameters to use the new ClearParameters structure.

src/libGLESv2/Context.cpp

@@ -1998,6 +1998,7 @@ void Context::clear(GLbitfield mask)
     }
 
     DWORD flags = 0;
+    GLbitfield finalMask = 0;
 
     if (mask & GL_COLOR_BUFFER_BIT)
     {
@@ -2006,6 +2007,7 @@ void Context::clear(GLbitfield mask)
         if (framebufferObject->getColorbufferType() != GL_NONE)
         {
             flags |= D3DCLEAR_TARGET;
+            finalMask |= GL_COLOR_BUFFER_BIT;
         }
     }
 
@@ -2015,6 +2017,7 @@ void Context::clear(GLbitfield mask)
         if (mState.depthStencil.depthMask && framebufferObject->getDepthbufferType() != GL_NONE)
         {
             flags |= D3DCLEAR_ZBUFFER;
+            finalMask |= GL_DEPTH_BUFFER_BIT;
         }
     }
 
@@ -2038,6 +2041,7 @@ void Context::clear(GLbitfield mask)
             if (stencilUnmasked != 0x0)
             {
                 flags |= D3DCLEAR_STENCIL;
+                finalMask |= GL_STENCIL_BUFFER_BIT;
             }
         }
     }
@@ -2212,9 +2216,18 @@ void Context::clear(GLbitfield mask)
     {
         mDevice->Clear(0, NULL, flags, color, depth, stencil);
     }
-
-    mRenderer->clear(mask, mState.colorClearValue, mState.depthClearValue, mState.stencilClearValue,
-                     framebufferObject);
+    ClearParameters clearParams;
+    clearParams.mask = finalMask;
+    clearParams.colorClearValue = mState.colorClearValue;
+    clearParams.colorMaskRed = mState.blend.colorMaskRed;
+    clearParams.colorMaskGreen = mState.blend.colorMaskGreen;
+    clearParams.colorMaskBlue = mState.blend.colorMaskBlue;
+    clearParams.colorMaskAlpha = mState.blend.colorMaskAlpha;
+    clearParams.depthClearValue = mState.depthClearValue;
+    clearParams.stencilClearValue = mState.stencilClearValue;
+    clearParams.stencilWriteMask = mState.depthStencil.stencilWritemask;
+
+    mRenderer->clear(clearParams, framebufferObject);
 }
 
 void Context::drawArrays(GLenum mode, GLint first, GLsizei count, GLsizei instances)

src/libGLESv2/renderer/Renderer.h

@@ -96,8 +96,7 @@ class Renderer
 
     virtual GLenum applyVertexBuffer(gl::ProgramBinary *programBinary, gl::VertexAttribute vertexAttributes[], GLint first, GLsizei count, GLsizei instances, GLsizei *repeatDraw) = 0;
 
-    virtual void clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
-                       gl::Framebuffer *frameBuffer) = 0;
+    virtual void clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer) = 0;
 
     virtual void markAllStateDirty() = 0;
 

src/libGLESv2/renderer/Renderer11.cpp

@@ -411,8 +411,7 @@ void Renderer11::applyShaders(gl::ProgramBinary *programBinary)
     UNIMPLEMENTED();
 }
 
-void Renderer11::clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
-                       gl::Framebuffer *frameBuffer)
+void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
 {
     // TODO
     UNIMPLEMENTED();

src/libGLESv2/renderer/Renderer11.h

@@ -68,8 +68,7 @@ class Renderer11 : public Renderer
 
     virtual GLenum applyVertexBuffer(gl::ProgramBinary *programBinary, gl::VertexAttribute vertexAttributes[], GLint first, GLsizei count, GLsizei instances, GLsizei *repeatDraw);
 
-    virtual void clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
-                       gl::Framebuffer *frameBuffer);
+    virtual void clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer);
 
     virtual void markAllStateDirty();
 

src/libGLESv2/renderer/Renderer9.cpp

@@ -1119,8 +1119,7 @@ void Renderer9::applyShaders(gl::ProgramBinary *programBinary)
     programBinary->dirtyAllUniforms();
 }
 
-void Renderer9::clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
-                      gl::Framebuffer *frameBuffer)
+void Renderer9::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
 {
     mForceSetDepthStencilState = true;
 

src/libGLESv2/renderer/Renderer9.h

@@ -131,8 +131,7 @@ class Renderer9 : public Renderer
 
     virtual GLenum applyVertexBuffer(gl::ProgramBinary *programBinary, gl::VertexAttribute vertexAttributes[], GLint first, GLsizei count, GLsizei instances, GLsizei *repeatDraw);
 
-    virtual void clear(GLbitfield mask, const gl::Color &colorClear, float depthClear, int stencilClear,
-                       gl::Framebuffer *frameBuffer);
+    virtual void clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer);
 
     virtual void markAllStateDirty();