Get stencil buffer clear parameters format directly.

The state layer should not be querying render targets directly, since they are not a GL concept. BUG=angle:732 Change-Id: I5ee96ae54cced8a32c5082ddd9f8796a975e2591 Reviewed-on: https://chromium-review.googlesource.com/213971Reviewed-by: Brandon Jones <bajones@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

Get stencil buffer clear parameters format directly.
dd8488d3 · Jamie Madill · 82cceb2d · dd8488d3
Commit dd8488d3 authored Sep 03, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

State.cpp src/libGLESv2/State.cpp +2 -9

No files found.
--- a/src/libGLESv2/State.cpp
+++ b/src/libGLESv2/State.cpp
@@ -244,15 +244,8 @@ ClearParameters State::getClearParameters(GLbitfield mask) const
    {
        if (framebufferObject->getStencilbuffer() != NULL)
        {
-            rx::RenderTarget *depthStencil = framebufferObject->getStencilbuffer()->getRenderTarget();
+            GLenum stencilActualFormat = framebufferObject->getStencilbuffer()->getActualFormat();
-            if (!depthStencil)
+            if (GetInternalFormatInfo(stencilActualFormat).stencilBits > 0)
-            {
-                ERR("Depth stencil pointer unexpectedly null.");
-                ClearParameters nullClearParam = { 0 };
-                return nullClearParam;
-            }
-            if (GetInternalFormatInfo(depthStencil->getActualFormat()).stencilBits > 0)
            {
                clearParams.clearStencil = true;
            }