commit 57e6d50e47057577e953970166292d52c24c3bed
author Corentin Wallez <cwallez@chromium.org> Fri Dec 09 14:46:39 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Fri Dec 16 20:56:59 2016 +0000
tree d9286b1f15c0e2b103ca175c406bbacbea2a8d57
parent 4de340acf38bc7eaa23a2403c8676f0493e56fe9

FramebufferAttachment: make attach(nullptr) work like detach

Otherwise when trying to use a DEPTH texture for DEPTH_STENCIL,
attach(nullptr) gets called but the FramebufferAttachment still returns
true when isAttached is called.

BUG=angleproject:1523

Change-Id: I30b78aff619eb6cd63e0befac886bddc177a2e58
Reviewed-on: https://chromium-review.googlesource.com/418403
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/FramebufferTest.cpp

diff --git a/src/tests/gl_tests/FramebufferTest.cpp b/src/tests/gl_tests/FramebufferTest.cpp
index 430ca84..320f3f8 100644
--- a/src/tests/gl_tests/FramebufferTest.cpp
+++ b/src/tests/gl_tests/FramebufferTest.cpp
@@ -336,10 +336,10 @@
                        ES2_OPENGLES(),
                        ES3_OPENGLES());
 
-class FramebufferInvalidateTest : public ANGLETest
+class FramebufferTest_ES3 : public ANGLETest
 {
   protected:
-    FramebufferInvalidateTest() : mFramebuffer(0), mRenderbuffer(0) {}
+    FramebufferTest_ES3() : mFramebuffer(0), mRenderbuffer(0) {}
 
     void SetUp() override
     {
@@ -361,7 +361,7 @@
 };
 
 // Covers invalidating an incomplete framebuffer. This should be a no-op, but should not error.
-TEST_P(FramebufferInvalidateTest, Incomplete)
+TEST_P(FramebufferTest_ES3, InvalidateIncomplete)
 {
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
     glBindRenderbuffer(GL_RENDERBUFFER, mRenderbuffer);
@@ -376,4 +376,17 @@
     EXPECT_GL_NO_ERROR();
 }
 
-ANGLE_INSTANTIATE_TEST(FramebufferInvalidateTest, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
+// Test that the framebuffer state tracking robustly handles a depth-only attachment being set
+// as a depth-stencil attachment. It is equivalent to detaching the depth-stencil attachment.
+TEST_P(FramebufferTest_ES3, DepthOnlyAsDepthStencil)
+{
+    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER, mRenderbuffer);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, 4, 4);
+
+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER,
+                              mRenderbuffer);
+    EXPECT_GLENUM_NE(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+}
+
+ANGLE_INSTANTIATE_TEST(FramebufferTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());