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/Framebuffer.h

diff --git a/src/libGLESv2/Framebuffer.h b/src/libGLESv2/Framebuffer.h
index 56eb6d919..cd1a311 100644
--- a/src/libGLESv2/Framebuffer.h
+++ b/src/libGLESv2/Framebuffer.h
@@ -51,25 +51,7 @@
     GLenum getReadColorbufferType() const;
     FramebufferAttachment *getFirstColorbuffer() const;
 
-    GLenum getColorbufferType(unsigned int colorAttachment) const;
-    GLenum getDepthbufferType() const;
-    GLenum getStencilbufferType() const;
-    GLenum getDepthStencilbufferType() const;
-
-    GLuint getColorbufferHandle(unsigned int colorAttachment) const;
-    GLuint getDepthbufferHandle() const;
-    GLuint getStencilbufferHandle() const;
-    GLuint getDepthStencilbufferHandle() const;
-
-    GLint getColorbufferMipLevel(unsigned int colorAttachment) const;
-    GLint getDepthbufferMipLevel() const;
-    GLint getStencilbufferMipLevel() const;
-    GLint getDepthStencilbufferMipLevel() const;
-
-    GLint getColorbufferLayer(unsigned int colorAttachment) const;
-    GLint getDepthbufferLayer() const;
-    GLint getStencilbufferLayer() const;
-    GLint getDepthStencilbufferLayer() const;
+    virtual FramebufferAttachment *getAttachment(GLenum attachment) const;
 
     GLenum getDrawBufferState(unsigned int colorAttachment) const;
     void setDrawBufferState(unsigned int colorAttachment, GLenum drawBuffer);
@@ -81,6 +63,7 @@
     bool usingExtendedDrawBuffers() const;
 
     virtual GLenum completeness() const;
+    bool hasValidDepthStencil() const;
 
   protected:
     rx::Renderer *mRenderer;
@@ -92,8 +75,6 @@
     FramebufferAttachment *mDepthbuffer;
     FramebufferAttachment *mStencilbuffer;
 
-    bool hasValidDepthStencil() const;
-
 private:
     DISALLOW_COPY_AND_ASSIGN(Framebuffer);
 
@@ -106,6 +87,7 @@
     DefaultFramebuffer(rx::Renderer *Renderer, Colorbuffer *colorbuffer, DepthStencilbuffer *depthStencil);
 
     virtual GLenum completeness() const;
+    virtual FramebufferAttachment *getAttachment(GLenum attachment) const;
 
   private:
     DISALLOW_COPY_AND_ASSIGN(DefaultFramebuffer);