Check framebuffer texture attachments are cube complete

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

 /*
  * 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 32 matching lines @@
     DECLARE_VIRTUAL_TRACE();
 
 private:
     explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*);
     WebGLRenderbufferAttachment() { }
 
     GLsizei width() const override;
     GLsizei height() const override;
     GLenum format() const override;
     GLenum type() const override;
+    bool isCubeComplete() const override;
     WebGLSharedObject* object() const override;
     bool isSharedObject(WebGLSharedObject*) const override;
     bool valid() const override;
     void onDetached(WebGraphicsContext3D*) override;
     void attach(WebGraphicsContext3D*, GLenum target, GLenum attachment) override;
     void unattach(WebGraphicsContext3D*, GLenum target, GLenum attachment) override;
 
     Member<WebGLRenderbuffer> m_renderbuffer;
 };
 
@@ skipping 73 matching lines @@
     } else {
         context->framebufferRenderbuffer(target, attachment, GL_RENDERBUFFER, 0);
     }
 }
 
 GLenum WebGLRenderbufferAttachment::type() const
 {
     return WebGLTexture::getValidTypeForInternalFormat(m_renderbuffer->internalFormat());
 }
 
+bool WebGLRenderbufferAttachment::isCubeComplete() const
+{
+    return false;

[zmo, 2015/11/23 19:40:44]

Maybe ASSERT_NOT_REACHED() here?

[qiankun, 2015/11/24 04:11:42]

Done.

+}
+
 class WebGLTextureAttachment final : public WebGLFramebuffer::WebGLAttachment {
 public:
     static WebGLFramebuffer::WebGLAttachment* create(WebGLTexture*, GLenum target, GLint level, GLint layer);
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     WebGLTextureAttachment(WebGLTexture*, GLenum target, GLint level, GLint layer);
     WebGLTextureAttachment() { }
 
     GLsizei width() const override;
     GLsizei height() const override;
     GLenum format() const override;
     GLenum type() const override;
+    bool isCubeComplete() const override;
     WebGLSharedObject* object() const override;
     bool isSharedObject(WebGLSharedObject*) const override;
     bool valid() const override;
     void onDetached(WebGraphicsContext3D*) override;
     void attach(WebGraphicsContext3D*, GLenum target, GLenum attachment) override;
     void unattach(WebGraphicsContext3D*, GLenum target, GLenum attachment) override;
 
     Member<WebGLTexture> m_texture;
     GLenum m_target;
     GLint m_level;
@@ skipping 77 matching lines @@
             context->framebufferTexture2D(target, attachment, m_target, 0, m_level);
         }
     }
 }
 
 GLenum WebGLTextureAttachment::type() const
 {
     return m_texture->getType(m_target, m_level);
 }
 
+bool WebGLTextureAttachment::isCubeComplete() const
+{
+    return m_texture->isCubeComplete();
+}
+
 bool isColorRenderable(GLenum internalformat, bool includesFloat)
 {
     switch (internalformat) {
     case GL_RGB:
     case GL_RGBA:
     case GL_SRGB_ALPHA_EXT:
     case GL_R8:
     case GL_R8UI:
     case GL_R8I:
     case GL_R16UI:
@@ skipping 176 matching lines @@
             *reason = "the internalformat of the attached image is not color-renderable";
             return false;
         }
         break;
     }
 
     if (!attachedObject->width() || !attachedObject->height()) {
         *reason = "attachment has a 0 dimension";
         return false;
     }
+
+    if (attachedObject->object()->isTexture() && !attachedObject->isCubeComplete()) {
+        *reason ="attachment is not cube complete";

[Ken Russell (switch to Gerrit), 2015/11/24 00:37:03]

Add space after =.

[qiankun, 2015/11/24 04:11:43]

Done.

+        return false;
+    }
+
     return true;
 }
 
 WebGLFramebuffer::WebGLAttachment* WebGLFramebuffer::getAttachment(GLenum attachment) const
 {
     const AttachmentMap::const_iterator it = m_attachments.find(attachment);
     return (it != m_attachments.end()) ? it->value.get() : 0;
 }
 
 void WebGLFramebuffer::removeAttachmentFromBoundFramebuffer(GLenum target, GLenum attachment)
@@ skipping 215 matching lines @@
     return true;
 }
 
 DEFINE_TRACE(WebGLFramebuffer)
 {
     visitor->trace(m_attachments);
     WebGLContextObject::trace(visitor);
 }
 
 }