Move special DEPTH_STENCIL attachment logic from command buffers to WebGL1

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

 // Copyright 2015 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 "modules/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 445 matching lines @@
     if (!validateTexFuncLevel("framebufferTextureLayer", textarget, level))
       return;
   }
 
   WebGLFramebuffer* framebufferBinding = getFramebufferBinding(target);
   if (!framebufferBinding || !framebufferBinding->object()) {
     synthesizeGLError(GL_INVALID_OPERATION, "framebufferTextureLayer",
                       "no framebuffer bound");
     return;
   }
-  if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-    contextGL()->FramebufferTextureLayer(target, GL_DEPTH_ATTACHMENT,
-                                         objectOrZero(texture), level, layer);
-    contextGL()->FramebufferTextureLayer(target, GL_STENCIL_ATTACHMENT,
-                                         objectOrZero(texture), level, layer);
-  } else {
-    contextGL()->FramebufferTextureLayer(target, attachment,
-                                         objectOrZero(texture), level, layer);
-  }
-  if (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.
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_DEPTH_ATTACHMENT, textarget, texture, level, layer);
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_STENCIL_ATTACHMENT, textarget, texture, level, layer);
-  } else {
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, attachment, textarget, texture, level, layer);
-  }
+  framebufferBinding->setAttachmentForBoundFramebuffer(
+      target, attachment, textarget, texture, level, layer);
   applyStencilTest();
 }
 
 ScriptValue WebGL2RenderingContextBase::getInternalformatParameter(
     ScriptState* scriptState,
     GLenum target,
     GLenum internalformat,
     GLenum pname) {
   if (isContextLost())
     return ScriptValue::createNull(scriptState);
@@ skipping 3997 matching lines @@
   params.skipPixels = m_unpackSkipPixels;
   params.skipRows = m_unpackSkipRows;
   if (dimension == Tex3D) {
     params.imageHeight = m_unpackImageHeight;
     params.skipImages = m_unpackSkipImages;
   }
   return params;
 }
 
 }  // namespace blink