Remove alpha/depth/stencil/antialias from WGC3D::Attributes.

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 219 matching lines @@
 static const int initialWidth = 100;
 static const int initialHeight = 100;
 static const int alternateHeight = 50;
 
 class DrawingBufferForTests : public DrawingBuffer {
 public:
     static PassRefPtr<DrawingBufferForTests> create(PassOwnPtr<WebGraphicsContext3DProvider> contextProvider, const IntSize& size, PreserveDrawingBuffer preserve)
     {
         OwnPtr<Extensions3DUtil> extensionsUtil = Extensions3DUtil::create(contextProvider->contextGL());
         RefPtr<DrawingBufferForTests> drawingBuffer = adoptRef(new DrawingBufferForTests(contextProvider, extensionsUtil.release(), preserve));
-        if (!drawingBuffer->initialize(size)) {
+        bool wantDepthBuffer = false;
+        bool wantStencilBuffer = false;
+        bool multisampleExtensionSupported = false;
+        if (!drawingBuffer->initialize(size, wantDepthBuffer, wantStencilBuffer, multisampleExtensionSupported)) {
             drawingBuffer->beginDestruction();
-            return PassRefPtr<DrawingBufferForTests>();
+            return nullptr;
         }
         return drawingBuffer.release();
     }
 
     DrawingBufferForTests(PassOwnPtr<WebGraphicsContext3DProvider> contextProvider, PassOwnPtr<Extensions3DUtil> extensionsUtil, PreserveDrawingBuffer preserve)
-        : DrawingBuffer(contextProvider, extensionsUtil, false /* multisampleExtensionSupported */, false /* discardFramebufferSupported */, false /* premultipliedAlpha */, preserve, WebGraphicsContext3D::Attributes())
+        : DrawingBuffer(contextProvider, extensionsUtil, false /* discardFramebufferSupported */, true /* wantAlphaChannel */, false /* premultipliedAlpha */, preserve)
         , m_live(0)
     { }
 
     ~DrawingBufferForTests() override
     {
         if (m_live)
             *m_live = false;
     }
 
     bool* m_live;
@@ skipping 21 matching lines @@
 class DrawingBufferTest : public Test {
 protected:
     void SetUp() override
     {
         OwnPtr<GLES2InterfaceForTests> gl = adoptPtr(new GLES2InterfaceForTests);
         m_gl = gl.get();
         OwnPtr<WebGraphicsContext3DForTests> context = adoptPtr(new WebGraphicsContext3DForTests(m_gl));
         m_context = context.get();
         OwnPtr<WebGraphicsContext3DProviderForTests> provider = adoptPtr(new WebGraphicsContext3DProviderForTests(context.release(), gl.release()));
         m_drawingBuffer = DrawingBufferForTests::create(provider.release(), IntSize(initialWidth, initialHeight), DrawingBuffer::Preserve);
+        CHECK(m_drawingBuffer);
     }
 
     WebGraphicsContext3DForTests* webContext()
     {
         return m_context;
     }
 
     WebGraphicsContext3DForTests* m_context;
     GLES2InterfaceForTests* m_gl;
     RefPtr<DrawingBufferForTests> m_drawingBuffer;
 };
 
 TEST_F(DrawingBufferTest, verifyResizingProperlyAffectsMailboxes)
 {
     WebExternalTextureMailbox mailbox;
 
     IntSize initialSize(initialWidth, initialHeight);
     IntSize alternateSize(initialWidth, alternateHeight);
 
     // Produce one mailbox at size 100x100.
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     EXPECT_EQ(initialSize, webContext()->mostRecentlyProducedSize());
 
     // Resize to 100x50.
-    m_drawingBuffer->reset(IntSize(initialWidth, alternateHeight));
+    m_drawingBuffer->reset(IntSize(initialWidth, alternateHeight), false);
     m_drawingBuffer->mailboxReleased(mailbox, false);
 
     // Produce a mailbox at this size.
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     EXPECT_EQ(alternateSize, webContext()->mostRecentlyProducedSize());
 
     // Reset to initial size.
-    m_drawingBuffer->reset(IntSize(initialWidth, initialHeight));
+    m_drawingBuffer->reset(IntSize(initialWidth, initialHeight), false);
     m_drawingBuffer->mailboxReleased(mailbox, false);
 
     // Prepare another mailbox and verify that it's the correct size.
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     EXPECT_EQ(initialSize, webContext()->mostRecentlyProducedSize());
 
     // Prepare one final mailbox and verify that it's the correct size.
     m_drawingBuffer->mailboxReleased(mailbox, false);
     m_drawingBuffer->markContentsChanged();
@@ skipping 178 matching lines @@
         OwnPtr<GLES2InterfaceForTests> gl = adoptPtr(new GLES2InterfaceForTests);
         m_gl = gl.get();
         OwnPtr<WebGraphicsContext3DForTests> context = adoptPtr(new WebGraphicsContext3DForTests(m_gl));
         m_context = context.get();
         OwnPtr<WebGraphicsContext3DProviderForTests> provider = adoptPtr(new WebGraphicsContext3DProviderForTests(context.release(), gl.release()));
         RuntimeEnabledFeatures::setWebGLImageChromiumEnabled(true);
         m_imageId0 = webContext()->nextImageIdToBeCreated();
         EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId0)).Times(1);
         m_drawingBuffer = DrawingBufferForTests::create(provider.release(),
             IntSize(initialWidth, initialHeight), DrawingBuffer::Preserve);
+        CHECK(m_drawingBuffer);
         testing::Mock::VerifyAndClearExpectations(webContext());
     }
 
     void TearDown() override
     {
         RuntimeEnabledFeatures::setWebGLImageChromiumEnabled(false);
     }
 
     GLuint m_imageId0;
 };
@@ skipping 12 matching lines @@
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     EXPECT_EQ(initialSize, webContext()->mostRecentlyProducedSize());
     EXPECT_TRUE(mailbox.allowOverlay);
     testing::Mock::VerifyAndClearExpectations(webContext());
 
     GLuint m_imageId2 = webContext()->nextImageIdToBeCreated();
     EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId2)).Times(1);
     EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId0)).Times(1);
     EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId0)).Times(1);
     // Resize to 100x50.
-    m_drawingBuffer->reset(IntSize(initialWidth, alternateHeight));
+    m_drawingBuffer->reset(IntSize(initialWidth, alternateHeight), false);
     m_drawingBuffer->mailboxReleased(mailbox, false);
     testing::Mock::VerifyAndClearExpectations(webContext());
 
     GLuint m_imageId3 = webContext()->nextImageIdToBeCreated();
     EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId3)).Times(1);
     EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId1)).Times(1);
     EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId1)).Times(1);
     // Produce a mailbox at this size.
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
     EXPECT_EQ(alternateSize, webContext()->mostRecentlyProducedSize());
     EXPECT_TRUE(mailbox.allowOverlay);
     testing::Mock::VerifyAndClearExpectations(webContext());
 
     GLuint m_imageId4 = webContext()->nextImageIdToBeCreated();
     EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId4)).Times(1);
     EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId2)).Times(1);
     EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId2)).Times(1);
     // Reset to initial size.
-    m_drawingBuffer->reset(IntSize(initialWidth, initialHeight));
+    m_drawingBuffer->reset(IntSize(initialWidth, initialHeight), false);
     m_drawingBuffer->mailboxReleased(mailbox, false);
     testing::Mock::VerifyAndClearExpectations(webContext());
 
     GLuint m_imageId5 = webContext()->nextImageIdToBeCreated();
     EXPECT_CALL(*m_gl, BindTexImage2DMock(m_imageId5)).Times(1);
     EXPECT_CALL(*m_gl, DestroyImageMock(m_imageId3)).Times(1);
     EXPECT_CALL(*m_gl, ReleaseTexImage2DMock(m_imageId3)).Times(1);
     // Prepare another mailbox and verify that it's the correct size.
     m_drawingBuffer->markContentsChanged();
     EXPECT_TRUE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
@@ skipping 38 matching lines @@
     }
 
     GLenum CheckFramebufferStatus(GLenum target) override
     {
         return GL_FRAMEBUFFER_COMPLETE;
     }
 
     void GetIntegerv(GLenum ptype, GLint* value) override
     {
         switch (ptype) {
-        case GL_DEPTH_BITS:
-            *value = (m_depthAttachment || m_depthStencilAttachment) ? 24 : 0;
-            return;
-        case GL_STENCIL_BITS:
-            *value = (m_stencilAttachment || m_depthStencilAttachment) ? 8 : 0;
-            return;
         case GL_MAX_TEXTURE_SIZE:
             *value = 1024;
             return;
         }
     }
 
     const GLubyte* GetString(GLenum type) override
     {
         if (type == GL_EXTENSIONS)
             return reinterpret_cast<const GLubyte*>("GL_OES_packed_depth_stencil");
@@ skipping 48 matching lines @@
     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)
 {
+    // When we request a depth or a stencil buffer, we will get both.
     DepthStencilTestCase cases[] = {
         DepthStencilTestCase(false, false, 0, "neither"),
-        DepthStencilTestCase(true, false, 1, "stencil only"),
-        DepthStencilTestCase(false, true, 1, "depth only"),
+        DepthStencilTestCase(true, true, 1, "stencil only"),
+        DepthStencilTestCase(true, true, 1, "depth only"),

[piman, 2016/04/01 01:40:28]

Are we testing 3 times the same thing? Should we fix the expectation instead?

[danakj, 2016/04/01 02:08:08]

Err.. haha oops. I read this as the expectations but you're right they are both.

[danakj, 2016/04/01 02:10:58]

Done.

         DepthStencilTestCase(true, true, 1, "both"),
     };
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(cases); i++) {
         SCOPED_TRACE(cases[i].testCaseName);
         OwnPtr<DepthStencilTrackingGLES2Interface> gl = adoptPtr(new DepthStencilTrackingGLES2Interface);
         DepthStencilTrackingGLES2Interface* trackingGL = gl.get();
         OwnPtr<DepthStencilTrackingContext> context = adoptPtr(new DepthStencilTrackingContext(trackingGL));
         DepthStencilTrackingContext* trackingContext = context.get();
         OwnPtr<WebGraphicsContext3DProviderForTests> provider = adoptPtr(new WebGraphicsContext3DProviderForTests(context.release(), gl.release()));
         DrawingBuffer::PreserveDrawingBuffer preserve = DrawingBuffer::Preserve;
 
-        WebGraphicsContext3D::Attributes requestedAttributes;
-        requestedAttributes.stencil = cases[i].requestStencil;
-        requestedAttributes.depth = cases[i].requestDepth;
-        RefPtr<DrawingBuffer> drawingBuffer = DrawingBuffer::create(provider.release(), IntSize(10, 10), false /* premultipliedAlpha */, preserve, requestedAttributes);
+        bool premultipliedAlpha = false;
+        bool wantAlphaChannel = true;
+        bool wantDepthBuffer = cases[i].requestDepth;
+        bool wantStencilBuffer = cases[i].requestStencil;
+        bool wantAntialiasing = false;
+        RefPtr<DrawingBuffer> drawingBuffer = DrawingBuffer::create(
+            provider.release(),
+            IntSize(10, 10),
+            premultipliedAlpha,
+            wantAlphaChannel,
+            wantDepthBuffer,
+            wantStencilBuffer,
+            wantAntialiasing,
+            preserve);
 
-        EXPECT_EQ(cases[i].requestDepth, drawingBuffer->getActualAttributes().depth);
-        EXPECT_EQ(cases[i].requestStencil, drawingBuffer->getActualAttributes().stencil);
+        EXPECT_EQ(cases[i].requestDepth, drawingBuffer->hasDepthBuffer());
+        EXPECT_EQ(cases[i].requestStencil, drawingBuffer->hasStencilBuffer());
         EXPECT_EQ(cases[i].expectedRenderBuffers, trackingContext->numAllocatedRenderBuffer());
         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());
         }
 
-        drawingBuffer->reset(IntSize(10, 20));
-        EXPECT_EQ(cases[i].requestDepth, drawingBuffer->getActualAttributes().depth);
-        EXPECT_EQ(cases[i].requestStencil, drawingBuffer->getActualAttributes().stencil);
+        drawingBuffer->reset(IntSize(10, 20), false);
+        EXPECT_EQ(cases[i].requestDepth, drawingBuffer->hasDepthBuffer());
+        EXPECT_EQ(cases[i].requestStencil, drawingBuffer->hasStencilBuffer());
         EXPECT_EQ(cases[i].expectedRenderBuffers, trackingContext->numAllocatedRenderBuffer());
         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());
         }
@@ skipping 52 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