Track currently bound external and multisample textures.

gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc

 // Copyright (c) 2016 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/gles2_cmd_decoder_passthrough.h"
 
 #include "base/strings/string_split.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "ui/gl/gl_version_info.h"
@@ skipping 192 matching lines @@
 
   mailbox_manager_ = group_->mailbox_manager();
 
   // Query information about the texture units
   GLint num_texture_units = 0;
   glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &num_texture_units);
 
   active_texture_unit_ = 0;
   bound_textures_[GL_TEXTURE_2D].resize(num_texture_units, 0);
   bound_textures_[GL_TEXTURE_CUBE_MAP].resize(num_texture_units, 0);
-  if (feature_info_->IsWebGL2OrES3Context()) {
+  if (feature_info_->gl_version_info().IsAtLeastGLES(3, 0)) {

[Zhenyao Mo, 2017/05/26 22:48:10]

Are you saying we will only create ES3 ANGLE contexts if we ask for WebGL2 or
ES3 decoder?

[Geoff Lang, 2017/05/29 13:47:43]

Correct, this is how ANGLE determines if it should do WebGL 1 or WebGL 2
validation as well.

     bound_textures_[GL_TEXTURE_2D_ARRAY].resize(num_texture_units, 0);
     bound_textures_[GL_TEXTURE_3D].resize(num_texture_units, 0);
   }
+  if (feature_info_->gl_version_info().IsAtLeastGLES(3, 1)) {
+    bound_textures_[GL_TEXTURE_2D_MULTISAMPLE].resize(num_texture_units, 0);
+  }
+  if (feature_info_->feature_flags().oes_egl_image_external ||
+      feature_info_->feature_flags().nv_egl_stream_consumer_external) {
+    bound_textures_[GL_TEXTURE_EXTERNAL_OES].resize(num_texture_units, 0);
+  }
 
   if (group_->gpu_preferences().enable_gpu_driver_debug_logging &&
       feature_info_->feature_flags().khr_debug) {
     InitializeGLDebugLogging();
   }
 
   set_initialized();
   return true;
 }
 
@@ skipping 681 matching lines @@
   }, /* NOLINT */
 
 const GLES2DecoderPassthroughImpl::CommandInfo
     GLES2DecoderPassthroughImpl::command_info[] = {
         GLES2_COMMAND_LIST(GLES2_CMD_OP)};
 
 #undef GLES2_CMD_OP
 
 }  // namespace gles2
 }  // namespace gpu