commit f75ab3509b66db268a51c550a8b3e056e8501149
author Jamie Madill <jmadill@chromium.org> Mon Mar 16 10:46:52 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Mar 16 14:56:30 2015 +0000
tree 3ad931a82bf45c5f95e77e31ead52cb402b934ba
parent 14fc83b653b7075b01be6dce004be92322fca4c9

Make ClearParameters an rx-only type.

This legacy struct duplicates some methods in the gl::State. We
can restrict its use to D3D and on newer back-ends use the State
directly.

BUG=angleproject:930

Change-Id: I2c298e76b072ee73f2b3e17f6696693031ce1f91
Reviewed-on: https://chromium-review.googlesource.com/258070
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/State.cpp

diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index ec75fa9..1423935 100644
--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -35,7 +35,7 @@
     mMaxDrawBuffers = caps.maxDrawBuffers;
     mMaxCombinedTextureImageUnits = caps.maxCombinedTextureImageUnits;
 
-    setClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    setColorClearValue(0.0f, 0.0f, 0.0f, 0.0f);
 
     mDepthClearValue = 1.0f;
     mStencilClearValue = 0;
@@ -212,7 +212,7 @@
     return mDepthStencil;
 }
 
-void State::setClearColor(float red, float green, float blue, float alpha)
+void State::setColorClearValue(float red, float green, float blue, float alpha)
 {
     mColorClearValue.red = red;
     mColorClearValue.green = green;
@@ -220,70 +220,16 @@
     mColorClearValue.alpha = alpha;
 }
 
-void State::setClearDepth(float depth)
+void State::setDepthClearValue(float depth)
 {
     mDepthClearValue = depth;
 }
 
-void State::setClearStencil(int stencil)
+void State::setStencilClearValue(int stencil)
 {
     mStencilClearValue = stencil;
 }
 
-ClearParameters State::getClearParameters(GLbitfield mask) const
-{
-    ClearParameters clearParams;
-    memset(&clearParams, 0, sizeof(ClearParameters));
-    for (unsigned int i = 0; i < ArraySize(clearParams.clearColor); i++)
-    {
-        clearParams.clearColor[i] = false;
-    }
-    clearParams.colorFClearValue = mColorClearValue;
-    clearParams.colorClearType = GL_FLOAT;
-    clearParams.colorMaskRed = mBlend.colorMaskRed;
-    clearParams.colorMaskGreen = mBlend.colorMaskGreen;
-    clearParams.colorMaskBlue = mBlend.colorMaskBlue;
-    clearParams.colorMaskAlpha = mBlend.colorMaskAlpha;
-    clearParams.clearDepth = false;
-    clearParams.depthClearValue = mDepthClearValue;
-    clearParams.clearStencil = false;
-    clearParams.stencilClearValue = mStencilClearValue;
-    clearParams.stencilWriteMask = mDepthStencil.stencilWritemask;
-    clearParams.scissorEnabled = mScissorTest;
-    clearParams.scissor = mScissor;
-
-    const Framebuffer *framebufferObject = getDrawFramebuffer();
-    if (mask & GL_COLOR_BUFFER_BIT)
-    {
-        if (framebufferObject->hasEnabledColorAttachment())
-        {
-            for (unsigned int i = 0; i < ArraySize(clearParams.clearColor); i++)
-            {
-                clearParams.clearColor[i] = true;
-            }
-        }
-    }
-
-    if (mask & GL_DEPTH_BUFFER_BIT)
-    {
-        if (mDepthStencil.depthMask && framebufferObject->getDepthbuffer() != NULL)
-        {
-            clearParams.clearDepth = true;
-        }
-    }
-
-    if (mask & GL_STENCIL_BUFFER_BIT)
-    {
-        if (framebufferObject->getStencilbuffer() != NULL &&
-            framebufferObject->getStencilbuffer()->getStencilSize() > 0)
-        {
-            clearParams.clearStencil = true;
-        }
-    }
-
-    return clearParams;
-}
-
 void State::setColorMask(bool red, bool green, bool blue, bool alpha)
 {
     mBlend.colorMaskRed = red;