Move special DEPTH_STENCIL attachment logic from command buffers to WebGL1

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.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 2510 matching lines @@
   }
   // Don't allow the default framebuffer to be mutated; all current
   // implementations use an FBO internally in place of the default
   // FBO.
   WebGLFramebuffer* framebufferBinding = getFramebufferBinding(target);
   if (!framebufferBinding || !framebufferBinding->object()) {
     synthesizeGLError(GL_INVALID_OPERATION, "framebufferRenderbuffer",
                       "no framebuffer bound");
     return;
   }
-  GLuint bufferObject = objectOrZero(buffer);
-  if (isWebGL2OrHigher() && attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-    // On ES3, DEPTH_STENCIL_ATTACHMENT is like an alias for DEPTH_ATTACHMENT +
-    // STENCIL_ATTACHMENT.  We divide it here so in WebGLFramebuffer, we don't
-    // have to handle DEPTH_STENCIL_ATTACHMENT in WebGL 2.
-    contextGL()->FramebufferRenderbuffer(target, GL_DEPTH_ATTACHMENT,
-                                         renderbuffertarget, bufferObject);
-    contextGL()->FramebufferRenderbuffer(target, GL_STENCIL_ATTACHMENT,
-                                         renderbuffertarget, bufferObject);
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_DEPTH_ATTACHMENT, buffer);
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_STENCIL_ATTACHMENT, buffer);
-  } else {
-    contextGL()->FramebufferRenderbuffer(target, attachment, renderbuffertarget,
-                                         bufferObject);
-    framebufferBinding->setAttachmentForBoundFramebuffer(target, attachment,
-                                                         buffer);
-  }
+  framebufferBinding->setAttachmentForBoundFramebuffer(target, attachment,
+                                                       buffer);
   applyStencilTest();
 }
 
 void WebGLRenderingContextBase::framebufferTexture2D(GLenum target,
                                                      GLenum attachment,
                                                      GLenum textarget,
                                                      WebGLTexture* texture,
                                                      GLint level) {
   if (isContextLost() ||
       !validateFramebufferFuncParameters("framebufferTexture2D", target,
                                          attachment))
     return;
   if (texture && !texture->validate(contextGroup(), this)) {
     synthesizeGLError(GL_INVALID_OPERATION, "framebufferTexture2D",
                       "no texture or texture not from this context");
     return;
   }
   // Don't allow the default framebuffer to be mutated; all current
   // implementations use an FBO internally in place of the default
   // FBO.
   WebGLFramebuffer* framebufferBinding = getFramebufferBinding(target);
   if (!framebufferBinding || !framebufferBinding->object()) {
     synthesizeGLError(GL_INVALID_OPERATION, "framebufferTexture2D",
                       "no framebuffer bound");
     return;
   }
-  GLuint textureObject = objectOrZero(texture);
-  if (isWebGL2OrHigher() && attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-    // On ES3, DEPTH_STENCIL_ATTACHMENT is like an alias for DEPTH_ATTACHMENT +
-    // STENCIL_ATTACHMENT.  We divide it here so in WebGLFramebuffer, we don't
-    // have to handle DEPTH_STENCIL_ATTACHMENT in WebGL 2.
-    contextGL()->FramebufferTexture2D(target, GL_DEPTH_ATTACHMENT, textarget,
-                                      textureObject, level);
-    contextGL()->FramebufferTexture2D(target, GL_STENCIL_ATTACHMENT, textarget,
-                                      textureObject, level);
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_DEPTH_ATTACHMENT, textarget, texture, level, 0);
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_STENCIL_ATTACHMENT, textarget, texture, level, 0);
-  } else {
-    contextGL()->FramebufferTexture2D(target, attachment, textarget,
-                                      textureObject, level);
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, attachment, textarget, texture, level, 0);
-  }
+  framebufferBinding->setAttachmentForBoundFramebuffer(
+      target, attachment, textarget, texture, level, 0);
   applyStencilTest();
 }
 
 void WebGLRenderingContextBase::frontFace(GLenum mode) {
   if (isContextLost())
     return;
   contextGL()->FrontFace(mode);
 }
 
 void WebGLRenderingContextBase::generateMipmap(GLenum target) {
@@ skipping 4870 matching lines @@
 
 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(
     HTMLCanvasElementOrOffscreenCanvas& result) const {
   if (canvas())
     result.setHTMLCanvasElement(canvas());
   else
     result.setOffscreenCanvas(getOffscreenCanvas());
 }
 
 }  // namespace blink