commit 685dd27a259cfa0127b20a32f223d00a7c020ef1
author Jamie Madill <jmadill@chromium.org> Fri Aug 29 15:46:43 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Tue Sep 02 21:21:21 2014 +0000
tree 913d954d523054a2adf5f6bfeeec014166bba04e
parent 97d65b79212d64974d03c8d5e9017ce93717a874

Replace getDepthStencil with getRenderTarget.

In all places where we called this method, we treated a NULL return
value as an internal error. This implies to me that we don't need the
two getRenderTarget and getDepthStencil methods, since we aren't using
them to check if a surface is depth or stencil.

BUG=angle:732

Change-Id: I4d1dc148abf3383b1b101bbff4f4d22de27ad03e
Reviewed-on: https://chromium-review.googlesource.com/213852
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@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 9ddfc43..b472eeb 100644
--- a/src/libGLESv2/State.cpp
+++ b/src/libGLESv2/State.cpp
@@ -244,7 +244,7 @@
     {
         if (framebufferObject->getStencilbuffer() != NULL)
         {
-            rx::RenderTarget *depthStencil = framebufferObject->getStencilbuffer()->getDepthStencil();
+            rx::RenderTarget *depthStencil = framebufferObject->getStencilbuffer()->getRenderTarget();
             if (!depthStencil)
             {
                 ERR("Depth stencil pointer unexpectedly null.");