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

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/feature_info.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
@@ skipping 546 matching lines @@
     if (enable_depth_texture) {
       validators_.texture_internal_format.AddValue(GL_DEPTH_STENCIL);
       validators_.texture_format.AddValue(GL_DEPTH_STENCIL);
       validators_.pixel_type.AddValue(GL_UNSIGNED_INT_24_8);
       validators_.texture_depth_renderable_internal_format.AddValue(
           GL_DEPTH_STENCIL);
       validators_.texture_stencil_renderable_internal_format.AddValue(
           GL_DEPTH_STENCIL);
     }
     validators_.render_buffer_format.AddValue(GL_DEPTH24_STENCIL8);
+    if (context_type_ == CONTEXT_TYPE_WEBGL1) {
+      // For glFramebufferRenderbuffer and glFramebufferTexture2D calls with
+      // attachment == GL_DEPTH_STENCIL_ATTACHMENT, we always split into two
+      // calls, one with attachment == GL_DEPTH_ATTACHMENT, and one with
+      // attachment == GL_STENCIL_ATTACHMENT.  So even if the underlying driver
+      // is ES2 where GL_DEPTH_STENCIL_ATTACHMENT isn't accepted, it is still
+      // OK.
+      validators_.attachment.AddValue(GL_DEPTH_STENCIL_ATTACHMENT);
+    }
   }
 
   if (gl_version_info_->is_es3 ||
       gl_version_info_->is_desktop_core_profile ||
       extensions.Contains("GL_OES_vertex_array_object") ||
       extensions.Contains("GL_ARB_vertex_array_object") ||
       extensions.Contains("GL_APPLE_vertex_array_object")) {
     feature_flags_.native_vertex_array_object = true;
   }
 
@@ skipping 841 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu