commit dd8488d3ca5ebdb43e5a3f04e5018fc5305d97d1
author Jamie Madill <jmadill@chromium.org> Wed Sep 03 15:07:21 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Sep 10 13:49:56 2014 +0000
tree ec242a87b14cc822da002878dfc861204170f313
parent 82cceb2de7958c7706768f21052a2e3409511fb8

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/213971
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2/State.cpp

diff --git a/src/libGLESv2/State.cpp b/src/libGLESv2/State.cpp
index b472eeb..5497fa7 100644
--- a/src/libGLESv2/State.cpp
+++ b/src/libGLESv2/State.cpp
@@ -244,15 +244,8 @@
     {
         if (framebufferObject->getStencilbuffer() != NULL)
         {
-            rx::RenderTarget *depthStencil = framebufferObject->getStencilbuffer()->getRenderTarget();
-            if (!depthStencil)
-            {
-                ERR("Depth stencil pointer unexpectedly null.");
-                ClearParameters nullClearParam = { 0 };
-                return nullClearParam;
-            }
-
-            if (GetInternalFormatInfo(depthStencil->getActualFormat()).stencilBits > 0)
+            GLenum stencilActualFormat = framebufferObject->getStencilbuffer()->getActualFormat();
+            if (GetInternalFormatInfo(stencilActualFormat).stencilBits > 0)
             {
                 clearParams.clearStencil = true;
             }