commit 2eeb1b34ec59ecf701eb8fc31162b95d660cb90a
author Bryan Bernhart (Intel Americas Inc) <bryan.bernhart@intel.com> Wed Nov 29 16:06:43 2017 -0800
committer Commit Bot <commit-bot@chromium.org> Mon Dec 04 22:47:13 2017 +0000
tree 952a5ac2c9f92e58bb2a0da1c7bf4272001ca648
parent fdb400d7c3d2361fc305577563ee85b9117774ff

WebGLCompat: Fix depthstencil query results.

getFramebufferAttachmentParameter returns incorrect
result for framebuffers in an inconsistent state.

BUG=angleproject:2259

Change-Id: I76fa99f1b8847c30469d344bd93dedd9cf6657bf
Reviewed-on: https://chromium-review.googlesource.com/798318
Reviewed-by: Bryan Bernhart <bryan.bernhart@intel.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Framebuffer.h

diff --git a/src/libANGLE/Framebuffer.h b/src/libANGLE/Framebuffer.h
index 25985d1..32d3507 100644
--- a/src/libANGLE/Framebuffer.h
+++ b/src/libANGLE/Framebuffer.h
@@ -60,7 +60,7 @@
     const std::string &getLabel();
     size_t getReadIndex() const;
 
-    const FramebufferAttachment *getAttachment(GLenum attachment) const;
+    const FramebufferAttachment *getAttachment(const Context *context, GLenum attachment) const;
     const FramebufferAttachment *getReadAttachment() const;
     const FramebufferAttachment *getFirstNonNullAttachment() const;
     const FramebufferAttachment *getFirstColorAttachment() const;
@@ -100,6 +100,8 @@
     GLint getBaseViewIndex() const;
 
   private:
+    const FramebufferAttachment *getWebGLDepthStencilAttachment() const;
+
     friend class Framebuffer;
 
     std::string mLabel;
@@ -185,7 +187,7 @@
     const FramebufferAttachment *getFirstColorbuffer() const;
     const FramebufferAttachment *getFirstNonNullAttachment() const;
 
-    const FramebufferAttachment *getAttachment(GLenum attachment) const;
+    const FramebufferAttachment *getAttachment(const Context *context, GLenum attachment) const;
     GLenum getMultiviewLayout() const;
     GLsizei getNumViews() const;
     GLint getBaseViewIndex() const;