Move special DEPTH_STENCIL attachment logic from command buffers to WebGL1

gpu/command_buffer/service/framebuffer_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 45 matching lines @@
     virtual bool Is3D() const = 0;
 
     // If it's a 3D texture attachment, return true if
     // FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER is smaller than the number of
     // layers in the texture.
     virtual bool IsLayerValid() const = 0;
 
     virtual bool CanRenderTo(const FeatureInfo* feature_info) const = 0;
     virtual void DetachFromFramebuffer(Framebuffer* framebuffer) const = 0;
     virtual bool ValidForAttachmentType(GLenum attachment_type,
-                                        ContextType context_type,
                                         uint32_t max_color_attachments) = 0;
     virtual size_t GetSignatureSize(TextureManager* texture_manager) const = 0;
     virtual void AddToSignature(
         TextureManager* texture_manager, std::string* signature) const = 0;
     virtual bool FormsFeedbackLoop(
         TextureRef* texture, GLint level, GLint layer) const = 0;
     virtual bool EmulatingRGB() const = 0;
 
    protected:
     friend class base::RefCounted<Attachment>;
@@ skipping 67 matching lines @@
     has_been_bound_ = true;
   }
 
   bool IsValid() const {
     return has_been_bound_ && !IsDeleted();
   }
 
   bool HasColorAttachment(int index) const;
   bool HasDepthAttachment() const;
   bool HasStencilAttachment() const;
-  // The following look at DEPTH_STENCIL_ATTACHMENT or
-  // DEPTH_ATTACHMENT/STENCIL_ATTACHMENT.
-  // TODO(piman): DEPTH_STENCIL_ATTACHMENT is not a real attachment point,
-  // except for WebGL1. Fix this.  http://crbug.com/630568
-  const Attachment* GetDepthAttachment() const;
-  const Attachment* GetStencilAttachment() const;
   GLenum GetDepthFormat() const;
   GLenum GetStencilFormat() const;
   GLenum GetDrawBufferInternalFormat() const;
   GLenum GetReadBufferInternalFormat() const;
   // If the color attachment is a texture, returns its type; otherwise,
   // returns 0.
   GLenum GetReadBufferTextureType() const;
 
   // Verify all the rules in OpenGL ES 2.0.25 4.4.5 are followed.
   // Returns GL_FRAMEBUFFER_COMPLETE if there are no reasons we know we can't
@@ skipping 139 matching lines @@
   scoped_refptr<Framebuffer> bound_read_framebuffer;
   scoped_refptr<Framebuffer> bound_draw_framebuffer;
 };
 
 // This class keeps track of the frambebuffers and their attached renderbuffers
 // so we can correctly clear them.
 class GPU_EXPORT FramebufferManager {
  public:
   FramebufferManager(uint32_t max_draw_buffers,
                      uint32_t max_color_attachments,
-                     ContextType context_type,
                      const scoped_refptr<FramebufferCompletenessCache>&
                          framebuffer_combo_complete_cache);
   ~FramebufferManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a Framebuffer for the given framebuffer.
   void CreateFramebuffer(GLuint client_id, GLuint service_id);
 
@@ skipping 14 matching lines @@
   void MarkAsComplete(Framebuffer* framebuffer);
 
   bool IsComplete(Framebuffer* framebuffer);
 
   void IncFramebufferStateChangeCount() {
     // make sure this is never 0.
     framebuffer_state_change_count_ =
         (framebuffer_state_change_count_ + 1) | 0x80000000U;
   }
 
-  ContextType context_type() const { return context_type_; }
-
  private:
   friend class Framebuffer;
 
   void StartTracking(Framebuffer* framebuffer);
   void StopTracking(Framebuffer* framebuffer);
 
   FramebufferCompletenessCache* GetFramebufferComboCompleteCache() {
     return framebuffer_combo_complete_cache_.get();
   }
 
   // Info for each framebuffer in the system.
   typedef base::hash_map<GLuint, scoped_refptr<Framebuffer> >
       FramebufferMap;
   FramebufferMap framebuffers_;
 
   // Incremented anytime anything changes that might effect framebuffer
   // state.
   unsigned framebuffer_state_change_count_;
 
   // Counts the number of Framebuffer allocated with 'this' as its manager.
   // Allows to check no Framebuffer will outlive this.
   unsigned int framebuffer_count_;
 
   bool have_context_;
 
   uint32_t max_draw_buffers_;
   uint32_t max_color_attachments_;
 
-  ContextType context_type_;
-
   scoped_refptr<FramebufferCompletenessCache> framebuffer_combo_complete_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(FramebufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_