Check layer is valid for framebuffer 3D texture attachments.

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 79 matching lines @@
   }
 
   bool Is3D() const override { return false; }
 
   bool CanRenderTo(const FeatureInfo*) const override { return true; }
 
   void DetachFromFramebuffer(Framebuffer* framebuffer) const override {
     // Nothing to do for renderbuffers.
   }
 
+  bool IsLayerValid() const override { return true; }
+
   bool ValidForAttachmentType(GLenum attachment_type,
                               ContextType context_type,
                               uint32_t max_color_attachments) override {
     uint32_t need = GLES2Util::GetChannelsNeededForAttachmentType(
         attachment_type, max_color_attachments);
     DCHECK_NE(0u, need);
     uint32_t have = GLES2Util::GetChannelsForFormat(internal_format());
     if (context_type == CONTEXT_TYPE_WEBGL1 &&
         DetectWebGL1DepthStencilAttachmentConflicts(need, have))
       return false;
@@ skipping 121 matching lines @@
   }
 
   bool CanRenderTo(const FeatureInfo* feature_info) const override {
     return texture_ref_->texture()->CanRenderTo(feature_info, level_);
   }
 
   void DetachFromFramebuffer(Framebuffer* framebuffer) const override {
     texture_ref_->texture()->DetachFromFramebuffer();
   }
 
+  bool IsLayerValid() const override {
+    Texture* texture = texture_ref_->texture();
+    DCHECK(texture);
+    GLsizei width, height, depth;
+    return (texture->GetLevelSize(texture->target(), level_,

[piman, 2016/05/27 01:37:25]

I think you need to take the attachment's target, not the texture's, so that it
works correctly for cube maps (see failing tests).

[Zhenyao Mo, 2016/05/27 12:44:35]

Done.  Added a unitttest to catch this bug.

+                                  &width, &height, &depth) &&
+            layer_ < depth);
+  }
+
   bool ValidForAttachmentType(GLenum attachment_type,
                               ContextType context_type,
                               uint32_t max_color_attachments) override {
     GLenum type = 0;
     GLenum internal_format = 0;
     if (!texture_ref_->texture()->GetLevelType(
         target_, level_, &type, &internal_format)) {
       return false;
     }
     uint32_t need = GLES2Util::GetChannelsNeededForAttachmentType(
@@ skipping 319 matching lines @@
   GLsizei height = -1;
   for (AttachmentMap::const_iterator it = attachments_.begin();
        it != attachments_.end(); ++it) {
     GLenum attachment_type = it->first;
     Attachment* attachment = it->second.get();
     if (!attachment->ValidForAttachmentType(attachment_type,
                                             feature_info->context_type(),
                                             manager_->max_color_attachments_)) {
       return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
     }
+    if (!attachment->IsLayerValid()) {
+      return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+    }
     if (width < 0) {
       width = attachment->width();
       height = attachment->height();
       if (width == 0 || height == 0) {
         return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
       }
     } else if (attachment->width() != width || attachment->height() != height) {
       // Since DirectX doesn't allow attachments to be of different sizes,
       // even though ES3 allows it, it is still forbidden to ensure consistent
       // behaviors across platforms.
@@ skipping 261 matching lines @@
 
 bool FramebufferManager::IsComplete(
     Framebuffer* framebuffer) {
   DCHECK(framebuffer);
   return framebuffer->framebuffer_complete_state_count_id() ==
       framebuffer_state_change_count_;
 }
 
 }  // namespace gles2
 }  // namespace gpu