Move special DEPTH_STENCIL attachment logic from command buffers to WebGL1

third_party/WebKit/Source/modules/webgl/WebGLFramebuffer.h

 /*
  * Copyright (C) 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 52 matching lines @@
     ~WebGLFramebuffer() override;
 
     static WebGLFramebuffer* create(WebGLRenderingContextBase*);
 
     GLuint object() const { return m_object; }
 
     void setAttachmentForBoundFramebuffer(GLenum target, GLenum attachment, GLenum texTarget, WebGLTexture*, GLint level, GLint layer);
     void setAttachmentForBoundFramebuffer(GLenum target, GLenum attachment, WebGLRenderbuffer*);
     // If an object is attached to the currently bound framebuffer, remove it.
     void removeAttachmentFromBoundFramebuffer(GLenum target, WebGLSharedObject*);
-    // If a given attachment point for the currently bound framebuffer is not null, remove the attached object.
-    void removeAttachmentFromBoundFramebuffer(GLenum target, GLenum attachment);
     WebGLSharedObject* getAttachmentObject(GLenum) const;
 
     // WebGL 1 specific:
     //   1) can't allow depth_stencil for depth/stencil attachments, and vice versa.
     //   2) no conflicting DEPTH/STENCIL/DEPTH_STENCIL attachments.
     GLenum checkDepthStencilStatus(const char** reason) const;
 
     bool hasEverBeenBound() const { return object() && m_hasEverBeenBound; }
 
     void setHasEverBeenBound() { m_hasEverBeenBound = true; }
@@ skipping 18 matching lines @@
 
     bool hasObject() const override { return m_object != 0; }
     void deleteObjectImpl(gpu::gles2::GLES2Interface*) override;
 
 private:
     WebGLAttachment* getAttachment(GLenum attachment) const;
 
     // Check if the framebuffer is currently bound.
     bool isBound(GLenum target) const;
 
-    // attach 'attachment' at 'attachmentPoint'.
-    void attach(GLenum target, GLenum attachment, GLenum attachmentPoint);
-
     // Check if a new drawBuffers call should be issued. This is called when we add or remove an attachment.
     void drawBuffersIfNecessary(bool force);
 
+    void setAttachmentInternal(GLenum target, GLenum attachment, GLenum texTarget, WebGLTexture*, GLint level, GLint layer);
+    void setAttachmentInternal(GLenum target, GLenum attachment, WebGLRenderbuffer*);
+    // If a given attachment point for the currently bound framebuffer is not null, remove the attached object.
+    void removeAttachmentInternal(GLenum target, GLenum attachment);
+
+    void commitWebGL1DepthStencilIfConsistent(GLenum target);
+
     GLuint m_object;
 
     typedef HeapHashMap<GLenum, Member<WebGLAttachment>> AttachmentMap;
 
     AttachmentMap m_attachments;
     bool m_destructionInProgress;
 
     bool m_hasEverBeenBound;
+    bool m_webGL1DepthStencilConsistent;
 
     Vector<GLenum> m_drawBuffers;
     Vector<GLenum> m_filteredDrawBuffers;
 
     GLenum m_readBuffer;
 };
 
 } // namespace blink
 
 #endif // WebGLFramebuffer_h