Revert of WebGL 2: generate appropriate error for different dimensions of images attached to fbo

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 28 matching lines @@
     static WebGLFramebuffer::WebGLAttachment* create(WebGLRenderbuffer*);
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     explicit WebGLRenderbufferAttachment(WebGLRenderbuffer*);
     WebGLRenderbufferAttachment() { }
 
     GLsizei width() const override;
     GLsizei height() const override;
-    GLsizei depth() 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;
 
@@ skipping 19 matching lines @@
 GLsizei WebGLRenderbufferAttachment::width() const
 {
     return m_renderbuffer->width();
 }
 
 GLsizei WebGLRenderbufferAttachment::height() const
 {
     return m_renderbuffer->height();
 }
 
-GLsizei WebGLRenderbufferAttachment::depth() const
-{
-    return 1;
-}
-
 GLenum WebGLRenderbufferAttachment::format() const
 {
     GLenum format = m_renderbuffer->internalFormat();
     if (format == GL_DEPTH_STENCIL_OES
         && m_renderbuffer->emulatedStencilBuffer()
         && m_renderbuffer->emulatedStencilBuffer()->internalFormat() != GL_STENCIL_INDEX8) {
         return 0;
     }
     return format;
 }
@@ skipping 55 matching lines @@
     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;
-    GLsizei depth() 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;
 
@@ skipping 25 matching lines @@
 GLsizei WebGLTextureAttachment::width() const
 {
     return m_texture->getWidth(m_target, m_level);
 }
 
 GLsizei WebGLTextureAttachment::height() const
 {
     return m_texture->getHeight(m_target, m_level);
 }
 
-GLsizei WebGLTextureAttachment::depth() const
-{
-    return m_texture->getDepth(m_target, m_level);
-}
-
 GLenum WebGLTextureAttachment::format() const
 {
     return m_texture->getInternalFormat(m_target, m_level);
 }
 
 WebGLSharedObject* WebGLTextureAttachment::object() const
 {
     return m_texture->object() ? m_texture.get() : 0;
 }
 
@@ skipping 314 matching lines @@
         return 0;
     WebGLAttachment* attachment = getAttachment(GL_COLOR_ATTACHMENT0);
     if (!attachment)
         return 0;
     return attachment->format();
 }
 
 GLenum WebGLFramebuffer::checkStatus(const char** reason) const
 {
     unsigned count = 0;
-    GLsizei width = 0, height = 0, depth = 0;
+    GLsizei width = 0, height = 0;
     WebGLAttachment* depthAttachment = nullptr;
     WebGLAttachment* stencilAttachment = nullptr;
     WebGLAttachment* depthStencilAttachment = nullptr;
     bool isWebGL2OrHigher = context()->isWebGL2OrHigher();
     for (const auto& it : m_attachments) {
         WebGLAttachment* attachment = it.value.get();
         if (!isAttachmentComplete(attachment, it.key, reason))
             return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
         if (!attachment->valid()) {
             *reason = "attachment is not valid";
             return GL_FRAMEBUFFER_UNSUPPORTED;
         }
         if (!attachment->format()) {
             *reason = "attachment is an unsupported format";
             return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
         }
         switch (it.key) {
         case GL_DEPTH_ATTACHMENT:
             depthAttachment = attachment;
             break;
         case GL_STENCIL_ATTACHMENT:
             stencilAttachment = attachment;
             break;
         case GL_DEPTH_STENCIL_ATTACHMENT:
             depthStencilAttachment = attachment;
             break;
         }
-        // Note: In GLES 3, images for a framebuffer need not to have the same dimensions to be framebuffer complete.
-        // However, in Direct3D 11, on top of which OpenGL ES 3 behavior is emulated in Windows, all render targets
-        // must have the same size in all dimensions. In order to have consistent WebGL 2 behaviors across platforms,
-        // we generate FRAMEBUFFER_INCOMPLETE_DIMENSIONS in this situation.
-        if (!count) {
-            width = attachment->width();
-            height = attachment->height();
-            depth = attachment->depth();
-        } else {
-            if (width != attachment->width() || height != attachment->height() || depth != attachment->depth()) {
-                *reason = "attachments do not have the same dimensions";
-                return GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS;
+        if (!isWebGL2OrHigher) {
+            if (!count) {
+                width = attachment->width();
+                height = attachment->height();
+            } else {
+                if (width != attachment->width() || height != attachment->height()) {
+                    *reason = "attachments do not have the same dimensions";
+                    return GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS;
+                }
             }
         }
         ++count;
     }
     if (!count) {
         *reason = "no attachments";
         return GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT;
     }
     // WebGL 1 specific: no conflicting DEPTH/STENCIL/DEPTH_STENCIL attachments.
     if (!isWebGL2OrHigher
@@ skipping 106 matching lines @@
     return true;
 }
 
 DEFINE_TRACE(WebGLFramebuffer)
 {
     visitor->trace(m_attachments);
     WebGLContextObject::trace(visitor);
 }
 
 }