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

third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h

 /*
  * Copyright (c) 2010, 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 58 matching lines @@
 // Manages a rendering target (framebuffer + attachment) for a canvas.  Can publish its rendering
 // results to a WebLayer for compositing.
 class PLATFORM_EXPORT DrawingBuffer : public RefCounted<DrawingBuffer>, public WebExternalTextureLayerClient  {
     WTF_MAKE_NONCOPYABLE(DrawingBuffer);
 public:
     enum PreserveDrawingBuffer {
         Preserve,
         Discard
     };
 
-    static PassRefPtr<DrawingBuffer> create(PassOwnPtr<WebGraphicsContext3DProvider>, const IntSize&, bool premultipliedAlpha, PreserveDrawingBuffer, WebGraphicsContext3D::Attributes requestedAttributes);
+    static PassRefPtr<DrawingBuffer> create(
+        PassOwnPtr<WebGraphicsContext3DProvider>,
+        const IntSize&,
+        bool premultipliedAlpha,
+        bool wantAlphaChannel,
+        bool wantDepthBuffer,
+        bool wantStencilBuffer,
+        bool wantAntialiasing,
+        PreserveDrawingBuffer);
     static void forceNextDrawingBufferCreationToFail();
 
     ~DrawingBuffer() override;
 
     // Destruction will be completed after all mailboxes are released.
     void beginDestruction();
 
     // Issues a glClear() on all framebuffers associated with this DrawingBuffer. The caller is responsible for
     // making the context current and setting the clear values and masks. Modifies the framebuffer binding.
     void clearFramebuffers(GLbitfield clearMask);
 
     // Indicates whether the DrawingBuffer internally allocated a packed depth-stencil renderbuffer
     // in the situation where the end user only asked for a depth buffer. In this case, we need to
     // upgrade clears of the depth buffer to clears of the depth and stencil buffers in order to
     // avoid performance problems on some GPUs.
-    bool hasImplicitStencilBuffer() const;
+    bool hasImplicitStencilBuffer() const { return m_hasImplicitStencilBuffer; }
 
     // Given the desired buffer size, provides the largest dimensions that will fit in the pixel budget.
     static IntSize adjustSize(const IntSize& desiredSize, const IntSize& curSize, int maxTextureSize);
-    bool reset(const IntSize&);
+    bool reset(const IntSize&, bool wantDepthOrStencilBuffer);
     void bind(GLenum target);
     IntSize size() const { return m_size; }
 
     // Copies the multisample color buffer to the normal color buffer and leaves m_fbo bound.
     void commit();
 
     // commit should copy the full multisample buffer, and not respect the
     // current scissor bounds. Track the state of the scissor test so that it
     // can be disabled during calls to commit.
     void setScissorEnabled(bool scissorEnabled) { m_scissorEnabled = scissorEnabled; }
@@ skipping 37 matching lines @@
     bool bufferClearNeeded() const;
     void setIsHidden(bool);
     void setFilterQuality(SkFilterQuality);
 
     WebLayer* platformLayer();
 
     WebGraphicsContext3D* context();
     gpu::gles2::GLES2Interface* contextGL();
     WebGraphicsContext3DProvider* contextProvider();
 
-    // Returns the actual context attributes for this drawing buffer which may differ from the
-    // requested context attributes due to implementation limits.
-    WebGraphicsContext3D::Attributes getActualAttributes() const { return m_actualAttributes; }
+    bool hasDepthBuffer() const { return m_hasDepthBuffer; }
+    bool hasStencilBuffer() const { return m_hasStencilBuffer; }
 
     // WebExternalTextureLayerClient implementation.
     bool prepareMailbox(WebExternalTextureMailbox*, WebExternalBitmap*) override;
     void mailboxReleased(const WebExternalTextureMailbox&, bool lostResource = false) override;
 
     // Destroys the TEXTURE_2D binding for the owned context
     bool copyToPlatformTexture(WebGraphicsContext3D*, gpu::gles2::GLES2Interface*, GLuint texture, GLenum internalFormat,
         GLenum destType, GLint level, bool premultiplyAlpha, bool flipY, SourceDrawingBuffer);
 
     void setPackAlignment(GLint param);
 
     bool paintRenderingResultsToImageData(int&, int&, SourceDrawingBuffer, WTF::ArrayBufferContents&);
 
     int sampleCount() const { return m_sampleCount; }
     bool explicitResolveOfMultisampleData() const { return m_antiAliasingMode == MSAAExplicitResolve; }
 
     // Bind to m_drawFramebufferBinding or m_readFramebufferBinding if it's not 0.
     // Otherwise, bind to the default FBO.
     void restoreFramebufferBindings();
 
     void addNewMailboxCallback(PassOwnPtr<SameThreadClosure> closure) { m_newMailboxCallback = std::move(closure); }
 
 protected: // For unittests
     DrawingBuffer(
         PassOwnPtr<WebGraphicsContext3DProvider>,
         PassOwnPtr<Extensions3DUtil>,
-        bool multisampleExtensionSupported,
         bool discardFramebufferSupported,
+        bool wantAlphaChannel,
         bool premultipliedAlpha,
-        PreserveDrawingBuffer,
-        WebGraphicsContext3D::Attributes requestedAttributes);
+        PreserveDrawingBuffer);
 
-    bool initialize(const IntSize&);
+    bool initialize(const IntSize&, bool wantDepthBuffer, bool wantStencilBuffer, bool multisampleExtensionSupported);
 
 private:
     struct TextureParameters {
         DISALLOW_NEW();
         GLenum target;
         GLenum internalColorFormat;
         GLenum colorFormat;
         GLenum internalRenderbufferFormat;
 
         TextureParameters()
@@ skipping 44 matching lines @@
 
     void mailboxReleasedWithoutRecycling(const WebExternalTextureMailbox&);
 
     // Creates and binds a texture with the given parameters. Returns 0 on
     // failure, or the newly created texture id on success. The caller takes
     // ownership of the newly created texture.
     GLuint createColorTexture(const TextureParameters&);
 
     // Create the depth/stencil and multisample buffers, if needed.
     void createSecondaryBuffers();
-    bool resizeFramebuffer(const IntSize&);
-    bool resizeMultisampleFramebuffer(const IntSize&);
+    bool resizeFramebuffer(const IntSize&, bool wantDepthOrStencilBuffer);
+    bool resizeMultisampleFramebuffer(const IntSize&, bool wantDepthOrStencilBuffer);
     void resizeDepthStencil(const IntSize&);
 
     void clearPlatformLayer();
 
     PassRefPtr<MailboxInfo> recycledMailbox();
     PassRefPtr<MailboxInfo> createNewMailbox(const TextureInfo&);
     void deleteMailbox(const WebExternalTextureMailbox&);
     void freeRecycledMailboxes();
 
     // Updates the current size of the buffer, ensuring that s_currentResourceUsePixels is updated.
@@ skipping 23 matching lines @@
     // or if the flag is false, creates a default texture.
     TextureInfo createTextureAndAllocateMemory(const IntSize&);
 
     // Creates and allocates space for a default texture.
     TextureInfo createDefaultTextureAndAllocateMemory(const IntSize&);
 
     void resizeTextureMemory(TextureInfo*, const IntSize&);
 
     void attachColorBufferToCurrentFBO();
 
-    PreserveDrawingBuffer m_preserveDrawingBuffer;
+    const PreserveDrawingBuffer m_preserveDrawingBuffer;
     bool m_scissorEnabled;
     GLuint m_texture2DBinding;
     GLuint m_drawFramebufferBinding;
     GLuint m_readFramebufferBinding;
     GLenum m_activeTextureUnit;
 
     OwnPtr<WebGraphicsContext3DProvider> m_contextProvider;
     WebGraphicsContext3D* m_context; // Lifetime is tied to the m_contextProvider.
     gpu::gles2::GLES2Interface* m_gl; // Lifetime is tied to the m_contextProvider.
     OwnPtr<Extensions3DUtil> m_extensionsUtil;
     IntSize m_size;
-    WebGraphicsContext3D::Attributes m_requestedAttributes;
-    bool m_multisampleExtensionSupported;
-    bool m_discardFramebufferSupported;
-    bool m_premultipliedAlpha;
+    const bool m_discardFramebufferSupported;
+    const bool m_wantAlphaChannel;
+    const bool m_premultipliedAlpha;
+    bool m_hasDepthBuffer;
+    bool m_hasStencilBuffer;
+    bool m_hasImplicitStencilBuffer;
     GLuint m_fbo;
     // DrawingBuffer's output is double-buffered. m_colorBuffer is the back buffer.
     TextureInfo m_colorBuffer;
     struct FrontBufferInfo {
         TextureInfo texInfo;
         WebExternalTextureMailbox mailbox;
     };
     FrontBufferInfo m_frontColorBuffer;
 
     OwnPtr<SameThreadClosure> m_newMailboxCallback;
@@ skipping 14 matching lines @@
 
     enum AntialiasingMode {
         None,
         MSAAImplicitResolve,
         MSAAExplicitResolve,
         ScreenSpaceAntialiasing,
     };
 
     AntialiasingMode m_antiAliasingMode;
 
-    WebGraphicsContext3D::Attributes m_actualAttributes;
     int m_maxTextureSize;
     int m_sampleCount;
     int m_packAlignment;
     bool m_destructionInProgress;
     bool m_isHidden;
     SkFilterQuality m_filterQuality;
 
     OwnPtr<WebExternalTextureLayer> m_layer;
 
     // All of the mailboxes that this DrawingBuffer has ever created.
     Vector<RefPtr<MailboxInfo>> m_textureMailboxes;
     // Mailboxes that were released by the compositor can be used again by this DrawingBuffer.
     Deque<WebExternalTextureMailbox> m_recycledMailboxQueue;
 
     // If the width and height of the Canvas's backing store don't
     // match those that we were given in the most recent call to
     // reshape(), then we need an intermediate bitmap to read back the
     // frame buffer into. This seems to happen when CSS styles are
     // used to resize the Canvas.
     SkBitmap m_resizingBitmap;
 
     // Used to flip a bitmap vertically.
     Vector<uint8_t> m_scanline;
 };
 
 } // namespace blink
 
 #endif // DrawingBuffer_h