Command buffer: feedback loop detection for CopyTexSubImage3D

gpu/command_buffer/service/framebuffer_manager.cc

 // 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.
 
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 118 matching lines @@
     return renderbuffer_->GetSignatureSize();
   }
 
   void AddToSignature(TextureManager* texture_manager,
                       std::string* signature) const override {
     DCHECK(signature);
     renderbuffer_->AddToSignature(signature);
   }
 
   bool FormsFeedbackLoop(TextureRef* /* texture */,
-                         GLint /*level */) const override {
+                         GLint /* level */,
+                         GLint /* layer */) const override {
     return false;
   }
 
   bool EmulatingRGB() const override { return false; }
 
  protected:
   ~RenderbufferAttachment() override {}
 
  private:
   scoped_refptr<Renderbuffer> renderbuffer_;
@@ skipping 149 matching lines @@
     return texture_manager->GetSignatureSize();
   }
 
   void AddToSignature(TextureManager* texture_manager,
                       std::string* signature) const override {
     DCHECK(signature);
     texture_manager->AddToSignature(
         texture_ref_.get(), target_, level_, signature);
   }
 
-  bool FormsFeedbackLoop(TextureRef* texture, GLint level) const override {
-    return texture == texture_ref_.get() && level == level_;
+  bool FormsFeedbackLoop(TextureRef* texture,
+                         GLint level, GLint layer) const override {
+    return texture == texture_ref_.get() &&
+           level == level_ && layer == layer_;

[qiankun, 2016/07/28 13:59:31]

I suggest 4 space indent to return.

[yunchao, 2016/07/28 15:53:05]

Done.

   }
 
   bool EmulatingRGB() const override {
     return texture_ref_->texture()->EmulatingRGB();
   }
 
  protected:
   ~TextureAttachment() override {}
 
  private:
@@ skipping 757 matching lines @@
 
 bool FramebufferManager::IsComplete(
     Framebuffer* framebuffer) {
   DCHECK(framebuffer);
   return framebuffer->framebuffer_complete_state_count_id() ==
       framebuffer_state_change_count_;
 }
 
 }  // namespace gles2
 }  // namespace gpu