Make invalidateFramebuffer no-op for DEPTH_STENCIL attachment

gpu/command_buffer/service/renderbuffer_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_RENDERBUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_RENDERBUFFER_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 class FeatureInfo;
 class RenderbufferManager;
 
@@ skipping 10 matching lines @@
   }
 
   GLuint client_id() const {
     return client_id_;
   }
 
   bool cleared() const {
     return cleared_;
   }
 
+  // Only meaningful when the format is DEPTH_STENCIL.
+  // Whether the particular part of the renderbuffer is cleared.
+  bool cleared(GLenum attachment) const {
+    if (!is_depth_stencil_)

[qiankun, 2016/07/14 06:48:21]

Can this path be reached in your current implementation?

+      return cleared_;
+    if (attachment == GL_DEPTH_ATTACHMENT)
+      return depth_cleared_;
+    else if (attachment == GL_STENCIL_ATTACHMENT)
+      return stencil_cleared_;
+    // Should not be reached

[qiankun, 2016/07/14 06:48:21]

Maybe" ? : " is better.


Use NOTREACHED(); if keep current implementation.
And the last return is useless.

+    return cleared_;
+  }
+
   GLenum internal_format() const {
     return internal_format_;
   }
 
   GLsizei samples() const {
     return samples_;
   }
 
   GLsizei width() const {
     return width_;
@@ skipping 21 matching lines @@
   void AddToSignature(std::string* signature) const;
 
  private:
   friend class RenderbufferManager;
   friend class base::RefCounted<Renderbuffer>;
 
   ~Renderbuffer();
 
   void set_cleared(bool cleared) {
     cleared_ = cleared;
+    depth_cleared_ = cleared;
+    stencil_cleared_ = cleared;
+  }
+
+  // Only meaningful when the format is DEPTH_STENCIL.
+  // cleared_ is true only when both depth and stencil parts are cleared.
+  void set_cleared(GLenum attachment, bool cleared) {
+    if (!is_depth_stencil_)
+      return;
+    if (attachment == GL_DEPTH_ATTACHMENT) {
+      depth_cleared_ = cleared;
+      cleared_ = (depth_cleared_ == stencil_cleared_) ? cleared : false;
+    }
+    else if (attachment == GL_STENCIL_ATTACHMENT) {
+      stencil_cleared_ = cleared;
+      cleared_ = (depth_cleared_ == stencil_cleared_) ? cleared : false;
+    }
   }
 
   void SetInfo(
       GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) {
     samples_ = samples;
     internal_format_ = internalformat;
+    is_depth_stencil_ = Framebuffer::IsDepthStencilFormat(internalformat);
     width_ = width;
     height_ = height;
-    cleared_ = false;
+    set_cleared(false);
   }
 
   void MarkAsDeleted() {
     client_id_ = 0;
   }
 
   // RenderbufferManager that owns this Renderbuffer.
   RenderbufferManager* manager_;
 
   // Client side renderbuffer id.
   GLuint client_id_;
 
   // Service side renderbuffer id.
   GLuint service_id_;
 
-  // Whether this renderbuffer has been cleared
+  // Whether this renderbuffer has been cleared.
   bool cleared_;
 
+  // Whether the format of this renderbuffer is DEPTH_STENCIL.
+  bool is_depth_stencil_;
+
+  // Only meaningful when format is DEPTH_STENCIL.
+  // Whether the depth part of the renderbuffer has been cleared.
+  bool depth_cleared_;
+  // Whether the stencil part of the renderbuffer has been cleared.
+  bool stencil_cleared_;
+
   // Whether this renderbuffer has ever been bound.
   bool has_been_bound_;
 
-  // Number of samples (for multi-sampled renderbuffers)
+  // Number of samples (for multi-sampled renderbuffers).
   GLsizei samples_;
 
   // Renderbuffer internalformat set through RenderbufferStorage().
   GLenum internal_format_;
 
   // Dimensions of renderbuffer.
   GLsizei width_;
   GLsizei height_;
 };
 
@@ skipping 19 matching lines @@
   bool HaveUnclearedRenderbuffers() const {
     return num_uncleared_renderbuffers_ != 0;
   }
 
   void SetInfo(
       Renderbuffer* renderbuffer,
       GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
 
   void SetCleared(Renderbuffer* renderbuffer, bool cleared);
 
+  // Only meaningful when format is DEPTH_STENCIL.
+  // Sets the particular part of the renderbuffer as cleared or uncleared.
+  void SetCleared(Renderbuffer* renderbuffer, GLenum attachment, bool cleared);
+
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a Renderbuffer for the given renderbuffer ids.
   void CreateRenderbuffer(GLuint client_id, GLuint service_id);
 
   // Gets the renderbuffer for the given renderbuffer id.
   Renderbuffer* GetRenderbuffer(GLuint client_id);
 
   // Removes a renderbuffer for the given renderbuffer id.
@@ skipping 40 matching lines @@
   typedef base::hash_map<GLuint, scoped_refptr<Renderbuffer> > RenderbufferMap;
   RenderbufferMap renderbuffers_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderbufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_RENDERBUFFER_MANAGER_H_