Revert of Refactor context creation parameters into a struct.

gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.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_number_conversions.h"
 
 namespace gpu {
 namespace gles2 {
@@ skipping 118 matching lines @@
                                ClientServiceMap<GLuint, GLuint>* id_map,
                                bool create_if_missing) {
   return GetServiceID(client_id, id_map, create_if_missing, []() {
     GLuint service_id = 0;
     glGenFramebuffersEXT(1, &service_id);
     return service_id;
   });
 }
 
 GLuint GetTransformFeedbackServiceID(GLuint client_id,
-                                     ClientServiceMap<GLuint, GLuint>* id_map) {
-  return id_map->GetServiceIDOrInvalid(client_id);
+                                     ClientServiceMap<GLuint, GLuint>* id_map,
+                                     bool create_if_missing) {
+  return GetServiceID(client_id, id_map, create_if_missing, []() {
+    GLuint service_id = 0;
+    glGenTransformFeedbacks(1, &service_id);
+    return service_id;
+  });
 }
 
 GLuint GetVertexArrayServiceID(GLuint client_id,
-                               ClientServiceMap<GLuint, GLuint>* id_map) {
-  return id_map->GetServiceIDOrInvalid(client_id);
+                               ClientServiceMap<GLuint, GLuint>* id_map,
+                               bool create_if_missing) {
+  return GetServiceID(client_id, id_map, create_if_missing, []() {
+    GLuint service_id = 0;
+    glGenVertexArraysOES(1, &service_id);
+    return service_id;
+  });
 }
 
 GLuint GetProgramServiceID(GLuint client_id, PassthroughResources* resources) {
   return resources->program_id_map.GetServiceIDOrInvalid(client_id);
 }
 
 GLuint GetShaderServiceID(GLuint client_id, PassthroughResources* resources) {
   return resources->shader_id_map.GetServiceIDOrInvalid(client_id);
 }
 
@@ skipping 117 matching lines @@
     bound_textures_[active_texture_unit_] = texture;
   }
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoBindTransformFeedback(
     GLenum target,
     GLuint transformfeedback) {
   glBindTransformFeedback(
       target, GetTransformFeedbackServiceID(transformfeedback,
-                                            &transform_feedback_id_map_));
+                                            &transform_feedback_id_map_,
+                                            bind_generates_resource_));
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoBlendColor(GLclampf red,
                                                        GLclampf green,
                                                        GLclampf blue,
                                                        GLclampf alpha) {
   glBlendColor(red, green, blue, alpha);
   return error::kNoError;
 }
@@ skipping 411 matching lines @@
     GLintptr offset,
     GLsizeiptr size) {
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoFramebufferRenderbuffer(
     GLenum target,
     GLenum attachment,
     GLenum renderbuffertarget,
     GLuint renderbuffer) {
-  glFramebufferRenderbufferEXT(
-      target, attachment, renderbuffertarget,
-      GetRenderbufferServiceID(renderbuffer, resources_, false));
+  // TODO(geofflang): Handle this case in ANGLE by adding a WebGL validation
+  // mode.
+  if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+    glFramebufferRenderbufferEXT(
+        target, GL_DEPTH_ATTACHMENT, renderbuffertarget,
+        GetRenderbufferServiceID(renderbuffer, resources_, false));
+    glFramebufferRenderbufferEXT(
+        target, GL_STENCIL_ATTACHMENT, renderbuffertarget,
+        GetRenderbufferServiceID(renderbuffer, resources_, false));
+  } else {
+    glFramebufferRenderbufferEXT(
+        target, attachment, renderbuffertarget,
+        GetRenderbufferServiceID(renderbuffer, resources_, false));
+  }
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoFramebufferTexture2D(
     GLenum target,
     GLenum attachment,
     GLenum textarget,
     GLuint texture,
     GLint level) {
   glFramebufferTexture2DEXT(target, attachment, textarget,
@@ skipping 587 matching lines @@
 error::Error GLES2DecoderPassthroughImpl::DoIsTexture(GLuint texture,
                                                       uint32_t* result) {
   *result = glIsTexture(GetTextureServiceID(texture, resources_, false));
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoIsTransformFeedback(
     GLuint transformfeedback,
     uint32_t* result) {
   *result = glIsTransformFeedback(GetTransformFeedbackServiceID(
-      transformfeedback, &transform_feedback_id_map_));
+      transformfeedback, &transform_feedback_id_map_, false));
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoLineWidth(GLfloat width) {
   glLineWidth(width);
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoLinkProgram(GLuint program) {
   glLinkProgram(GetProgramServiceID(program, resources_));
@@ skipping 844 matching lines @@
 error::Error GLES2DecoderPassthroughImpl::DoDeleteVertexArraysOES(
     GLsizei n,
     const volatile GLuint* arrays) {
   return DeleteHelper(
       n, arrays, &vertex_array_id_map_,
       [](GLsizei n, GLuint* arrays) { glDeleteVertexArraysOES(n, arrays); });
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoIsVertexArrayOES(GLuint array,
                                                              uint32_t* result) {
-  *result =
-      glIsVertexArrayOES(GetVertexArrayServiceID(array, &vertex_array_id_map_));
+  *result = glIsVertexArrayOES(
+      GetVertexArrayServiceID(array, &vertex_array_id_map_, false));
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoBindVertexArrayOES(GLuint array) {
-  glBindVertexArrayOES(GetVertexArrayServiceID(array, &vertex_array_id_map_));
+  glBindVertexArrayOES(GetVertexArrayServiceID(array, &vertex_array_id_map_,
+                                               bind_generates_resource_));
   return error::kNoError;
 }
 
 error::Error GLES2DecoderPassthroughImpl::DoSwapBuffers() {
   gfx::SwapResult result = surface_->SwapBuffers();
   if (result == gfx::SwapResult::SWAP_FAILED) {
     LOG(ERROR) << "Context lost because SwapBuffers failed.";
   }
   // TODO(geofflang): force the context loss?
   return error::kNoError;
@@ skipping 793 matching lines @@
 GLES2DecoderPassthroughImpl::DoUniformMatrix4fvStreamTextureMatrixCHROMIUM(
     GLint location,
     GLboolean transpose,
     const volatile GLfloat* defaultValue) {
   NOTIMPLEMENTED();
   return error::kNoError;
 }
 
 }  // namespace gles2
 }  // namespace gpu