commit e92a3546da271f33110714508529fef7306c4656
author Jamie Madill <jmadill@chromium.org> Thu Jul 03 10:38:58 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Jul 10 22:18:37 2014 +0000
tree 051aae8cb28161206d4d4db43f063544e8af8fcc
parent 55ec3b111464887e6e3ab1df848cf73509cde418

Remove redundant FBO query methods.

Several query methods simply wrapped a NULL check with a default
return value. Most of these safety checks were unnecessary.

BUG=angle:660

Change-Id: I0ac6897f06be082c8efab8721920d1b51ba999ee
Reviewed-on: https://chromium-review.googlesource.com/205606
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index ac09e0e..fe7b361 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2594,7 +2594,7 @@
 
     if (mask & GL_DEPTH_BUFFER_BIT)
     {
-        if (mState.depthStencil.depthMask && framebufferObject->getDepthbufferType() != GL_NONE)
+        if (mState.depthStencil.depthMask && framebufferObject->getDepthbuffer() != NULL)
         {
             clearParams.clearDepth = true;
         }
@@ -2602,7 +2602,7 @@
 
     if (mask & GL_STENCIL_BUFFER_BIT)
     {
-        if (framebufferObject->getStencilbufferType() != GL_NONE)
+        if (framebufferObject->getStencilbuffer() != NULL)
         {
             rx::RenderTarget *depthStencil = framebufferObject->getStencilbuffer()->getDepthStencil();
             if (!depthStencil)