Move WebGL1 attachment image type / attachment point matching check to command buffer.

third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 543 matching lines @@
     EXPECT_CALL(*webContext(), releaseTexImage2DMock(m_imageId4)).Times(1);
     m_drawingBuffer->beginDestruction();
     testing::Mock::VerifyAndClearExpectations(webContext());
 }
 
 class DepthStencilTrackingContext : public MockWebGraphicsContext3D {
 public:
     DepthStencilTrackingContext()
         : m_nextRenderBufferId(1)
         , m_stencilAttachment(0)
-        , m_depthAttachment(0) {}
+        , m_depthAttachment(0)
+        , m_depthStencilAttachment(0) {}
     ~DepthStencilTrackingContext() override {}
 
     int numAllocatedRenderBuffer() const { return m_nextRenderBufferId - 1; }
     WebGLId stencilAttachment() const { return m_stencilAttachment; }
     WebGLId depthAttachment() const { return m_depthAttachment; }
+    WebGLId depthStencilAttachment() const { return m_depthStencilAttachment; }
 
     WebString getString(WGC3Denum type) override
     {
         if (type == GL_EXTENSIONS) {
             return WebString::fromUTF8("GL_OES_packed_depth_stencil");
         }
         return WebString();
     }
 
     WebGLId createRenderbuffer() override
     {
         return ++m_nextRenderBufferId;
     }
 
     void framebufferRenderbuffer(WGC3Denum target, WGC3Denum attachment, WGC3Denum renderbuffertarget, WebGLId renderbuffer) override
     {
-        if (attachment == GL_STENCIL_ATTACHMENT) {
+        switch (attachment) {
+        case GL_DEPTH_ATTACHMENT:
+            m_depthAttachment = renderbuffer;
+            break;
+        case GL_STENCIL_ATTACHMENT:
             m_stencilAttachment = renderbuffer;
-        } else {
-            m_depthAttachment = renderbuffer;
+            break;
+        case GL_DEPTH_STENCIL_ATTACHMENT:
+            m_depthStencilAttachment = renderbuffer;
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+            break;
         }
     }
 
     void getIntegerv(WGC3Denum ptype, WGC3Dint* value) override
     {
         switch (ptype) {
         case GL_DEPTH_BITS:
-            *value = m_depthAttachment ? 24 : 0;
+            *value = (m_depthAttachment || m_depthStencilAttachment) ? 24 : 0;
             return;
         case GL_STENCIL_BITS:
-            *value = m_stencilAttachment ? 8 : 0;
+            *value = (m_stencilAttachment || m_depthStencilAttachment) ? 8 : 0;
             return;
         }
         MockWebGraphicsContext3D::getIntegerv(ptype, value);
     }
 
 private:
     WebGLId m_nextRenderBufferId;
     WebGLId m_stencilAttachment;
     WebGLId m_depthAttachment;
+    WebGLId m_depthStencilAttachment;
 };
 
 struct DepthStencilTestCase {
-    DepthStencilTestCase(bool requestStencil, bool requestDepth, int expectedRenderBuffers, bool expectDepthStencil, const char* const testCaseName)
+    DepthStencilTestCase(bool requestStencil, bool requestDepth, int expectedRenderBuffers, const char* const testCaseName)
         : requestStencil(requestStencil)
         , requestDepth(requestDepth)
-        , expectDepthStencil(expectDepthStencil)
         , expectedRenderBuffers(expectedRenderBuffers)
         , testCaseName(testCaseName) { }
 
     bool requestStencil;
     bool requestDepth;
-    bool expectDepthStencil;
     int expectedRenderBuffers;
     const char* const testCaseName;
 };
 
 // This tests that when the packed depth+stencil extension is supported DrawingBuffer always allocates
 // a single packed renderbuffer if either is requested and properly computes the actual context attributes
 // as defined by WebGL. We always allocate a packed buffer in this case since many desktop OpenGL drivers
 // that support this extension do not consider a framebuffer with only a depth or a stencil buffer attached
 // to be complete.
 TEST(DrawingBufferDepthStencilTest, packedDepthStencilSupported)
 {
     DepthStencilTestCase cases[] = {
-        DepthStencilTestCase(false, false, false, 0, "neither"),
-        DepthStencilTestCase(true, false, true, 1, "stencil only"),
-        DepthStencilTestCase(false, true, true, 1, "depth only"),
-        DepthStencilTestCase(true, true, true, 1, "both"),
+        DepthStencilTestCase(false, false, 0, "neither"),
+        DepthStencilTestCase(true, false, 1, "stencil only"),
+        DepthStencilTestCase(false, true, 1, "depth only"),
+        DepthStencilTestCase(true, true, 1, "both"),
     };
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(cases); i++) {
         SCOPED_TRACE(cases[i].testCaseName);
         OwnPtr<DepthStencilTrackingContext> context = adoptPtr(new DepthStencilTrackingContext);
         DepthStencilTrackingContext* trackingContext = context.get();
         DrawingBuffer::PreserveDrawingBuffer preserve = DrawingBuffer::Preserve;
 
         WebGraphicsContext3D::Attributes requestedAttributes;
         requestedAttributes.stencil = cases[i].requestStencil;
         requestedAttributes.depth = cases[i].requestDepth;
         RefPtr<DrawingBuffer> drawingBuffer = DrawingBuffer::create(context.release(), IntSize(10, 10), preserve, requestedAttributes);
 
         EXPECT_EQ(cases[i].requestDepth, drawingBuffer->getActualAttributes().depth);
         EXPECT_EQ(cases[i].requestStencil, drawingBuffer->getActualAttributes().stencil);
         EXPECT_EQ(cases[i].expectedRenderBuffers, trackingContext->numAllocatedRenderBuffer());
-        if (cases[i].expectDepthStencil) {
-            EXPECT_EQ(trackingContext->stencilAttachment(), trackingContext->depthAttachment());
-        } else if (cases[i].requestStencil || cases[i].requestDepth) {
-            EXPECT_NE(trackingContext->stencilAttachment(), trackingContext->depthAttachment());
+        if (cases[i].requestDepth || cases[i].requestStencil) {
+            EXPECT_NE(0u, trackingContext->depthStencilAttachment());
+            EXPECT_EQ(0u, trackingContext->depthAttachment());
+            EXPECT_EQ(0u, trackingContext->stencilAttachment());
         } else {
+            EXPECT_EQ(0u, trackingContext->depthStencilAttachment());
+            EXPECT_EQ(0u, trackingContext->depthAttachment());
             EXPECT_EQ(0u, trackingContext->stencilAttachment());
-            EXPECT_EQ(0u, trackingContext->depthAttachment());
         }
 
         drawingBuffer->reset(IntSize(10, 20));
         EXPECT_EQ(cases[i].requestDepth, drawingBuffer->getActualAttributes().depth);
         EXPECT_EQ(cases[i].requestStencil, drawingBuffer->getActualAttributes().stencil);
         EXPECT_EQ(cases[i].expectedRenderBuffers, trackingContext->numAllocatedRenderBuffer());
-        if (cases[i].expectDepthStencil) {
-            EXPECT_EQ(trackingContext->stencilAttachment(), trackingContext->depthAttachment());
-        } else if (cases[i].requestStencil || cases[i].requestDepth) {
-            EXPECT_NE(trackingContext->stencilAttachment(), trackingContext->depthAttachment());
+        if (cases[i].requestDepth || cases[i].requestStencil) {
+            EXPECT_NE(0u, trackingContext->depthStencilAttachment());
+            EXPECT_EQ(0u, trackingContext->depthAttachment());
+            EXPECT_EQ(0u, trackingContext->stencilAttachment());
         } else {
+            EXPECT_EQ(0u, trackingContext->depthStencilAttachment());
+            EXPECT_EQ(0u, trackingContext->depthAttachment());
             EXPECT_EQ(0u, trackingContext->stencilAttachment());
-            EXPECT_EQ(0u, trackingContext->depthAttachment());
         }
 
         drawingBuffer->beginDestruction();
     }
 }
 
 TEST_F(DrawingBufferTest, verifySetIsHiddenProperlyAffectsMailboxes)
 {
     blink::WebExternalTextureMailbox mailbox;
 
@@ skipping 39 matching lines @@
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     EXPECT_EQ(initialSize, webContext()->mostRecentlyProducedSize());
     EXPECT_FALSE(mailbox.allowOverlay);
 
     m_drawingBuffer->mailboxReleased(mailbox, false);
     m_drawingBuffer->beginDestruction();
 }
 
 } // namespace blink