Move WebGL1 attachment image type / attachment point matching check to command buffer.

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 75 matching lines @@
     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;
+    return m_renderbuffer->internalFormat();
 }
 
 WebGLSharedObject* WebGLRenderbufferAttachment::object() const
 {
     return m_renderbuffer->object() ? m_renderbuffer.get() : 0;
 }
 
 bool WebGLRenderbufferAttachment::isSharedObject(WebGLSharedObject* object) const
 {
     return object == m_renderbuffer;
 }
 
 bool WebGLRenderbufferAttachment::valid() const
 {
     return m_renderbuffer->object();
 }
 
 void WebGLRenderbufferAttachment::onDetached(WebGraphicsContext3D* context)
 {
     m_renderbuffer->onDetached(context);
 }
 
 void WebGLRenderbufferAttachment::attach(WebGraphicsContext3D* context, GLenum target, GLenum attachment)
 {
     Platform3DObject object = objectOrZero(m_renderbuffer.get());
-    if (attachment == GL_DEPTH_STENCIL_ATTACHMENT && m_renderbuffer->emulatedStencilBuffer()) {
-        context->framebufferRenderbuffer(target, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, object);
-        context->framebufferRenderbuffer(target, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, objectOrZero(m_renderbuffer->emulatedStencilBuffer()));
-    } else {
-        context->framebufferRenderbuffer(target, attachment, GL_RENDERBUFFER, object);
-    }
+    context->framebufferRenderbuffer(target, attachment, GL_RENDERBUFFER, object);
 }
 
 void WebGLRenderbufferAttachment::unattach(WebGraphicsContext3D* context, GLenum target, GLenum attachment)
 {
-    if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-        context->framebufferRenderbuffer(target, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, 0);
-        context->framebufferRenderbuffer(target, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0);
-    } else {
-        context->framebufferRenderbuffer(target, attachment, GL_RENDERBUFFER, 0);
-    }
+    context->framebufferRenderbuffer(target, attachment, GL_RENDERBUFFER, 0);
 }
 
 GLenum WebGLRenderbufferAttachment::type() const
 {
     return WebGLTexture::getValidTypeForInternalFormat(m_renderbuffer->internalFormat());
 }
 
 bool WebGLRenderbufferAttachment::isCubeComplete() const
 {
     ASSERT_NOT_REACHED();
@@ skipping 97 matching lines @@
         context->framebufferTexture2D(target, attachment, m_target, object, m_level);
     }
 }
 
 void WebGLTextureAttachment::unattach(WebGraphicsContext3D* context, GLenum target, GLenum attachment)
 {
     // GL_DEPTH_STENCIL_ATTACHMENT attachment is valid in ES3.
     if (m_target == GL_TEXTURE_3D || m_target == GL_TEXTURE_2D_ARRAY) {
         context->framebufferTextureLayer(target, attachment, 0, m_level, m_layer);
     } else {
-        if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-            context->framebufferTexture2D(target, GL_DEPTH_ATTACHMENT, m_target, 0, m_level);
-            context->framebufferTexture2D(target, GL_STENCIL_ATTACHMENT, m_target, 0, m_level);
-        } else {
-            context->framebufferTexture2D(target, attachment, m_target, 0, m_level);
-        }
+        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
 {
@@ skipping 221 matching lines @@
     if (attachmentObject) {
         attachmentObject->onDetached(context()->webContext());
         m_attachments.remove(attachment);
         drawBuffersIfNecessary(false);
         switch (attachment) {
         case GL_DEPTH_STENCIL_ATTACHMENT:
             attach(target, GL_DEPTH_ATTACHMENT, GL_DEPTH_ATTACHMENT);
             attach(target, GL_STENCIL_ATTACHMENT, GL_STENCIL_ATTACHMENT);
             break;
         case GL_DEPTH_ATTACHMENT:
-            attach(target, GL_DEPTH_STENCIL_ATTACHMENT, GL_DEPTH_ATTACHMENT);
-            break;
         case GL_STENCIL_ATTACHMENT:
-            attach(target, GL_DEPTH_STENCIL_ATTACHMENT, GL_STENCIL_ATTACHMENT);
+            attach(target, GL_DEPTH_STENCIL_ATTACHMENT, GL_DEPTH_STENCIL_ATTACHMENT);
             break;
         }
     }
 }
 
 void WebGLFramebuffer::removeAttachmentFromBoundFramebuffer(GLenum target, WebGLSharedObject* attachment)
 {
     ASSERT(isBound(target));
     if (!m_object)
         return;
@@ skipping 95 matching lines @@
 GLenum WebGLFramebuffer::checkDepthStencilStatus(const char** reason) const
 {
     if (context()->isWebGL2OrHigher())
         return GL_FRAMEBUFFER_COMPLETE;
     WebGLAttachment* depthAttachment = nullptr;
     WebGLAttachment* stencilAttachment = nullptr;
     WebGLAttachment* depthStencilAttachment = nullptr;
     for (const auto& it : m_attachments) {
         WebGLAttachment* attachment = it.value.get();
         ASSERT(attachment);
-        GLenum internalformat = attachment->format();
         switch (it.key) {
         case GL_DEPTH_ATTACHMENT:
             depthAttachment = attachment;
-            if (!isDepthRenderable(internalformat, false)) {
-                *reason = "the internalformat of the attached image is not depth-renderable";
-                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
-            }
             break;
         case GL_STENCIL_ATTACHMENT:
             stencilAttachment = attachment;
-            if (!isStencilRenderable(internalformat, false)) {
-                *reason = "the internalformat of the attached image is not stencil-renderable";
-                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
-            }
             break;
         case GL_DEPTH_STENCIL_ATTACHMENT:
             depthStencilAttachment = attachment;
-            if (internalformat != GL_DEPTH_STENCIL_OES) {
-                *reason = "the internalformat of the attached image is not DEPTH_STENCIL";
-                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
-            }
             break;
         default:
             break;
         }
     }
     if ((depthStencilAttachment && (depthAttachment || stencilAttachment))
         || (depthAttachment && stencilAttachment)) {
         *reason = "conflicting DEPTH/STENCIL/DEPTH_STENCIL attachments";
         return GL_FRAMEBUFFER_UNSUPPORTED;
     }
@@ skipping 89 matching lines @@
     return true;
 }
 
 DEFINE_TRACE(WebGLFramebuffer)
 {
     visitor->trace(m_attachments);
     WebGLContextObject::trace(visitor);
 }
 
 } // namespace blink