Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

gpu/command_buffer/client/gles2_implementation_autogen.h

 // Copyright (c) 2011 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.
 
 // This file is auto-generated from
 // gpu/command_buffer/build_gles2_cmd_buffer.py
 // DO NOT EDIT!
 
 // This file is included by gles2_implementation.h to declare the
 // GL api functions.
@@ skipping 203 matching lines @@
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_DCHECK(buffers[i] != 0);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteBuffers: n < 0");
     return;
   }
   DeleteBuffersHelper(n, buffers);
-  helper_->DeleteBuffersImmediate(n, buffers);
-  Flush();
 }
 
 void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) {
   GPU_CLIENT_LOG("[" << this << "] glDeleteFramebuffers(" << n << ", " << static_cast<const void*>(framebuffers) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << framebuffers[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_DCHECK(framebuffers[i] != 0);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteFramebuffers: n < 0");
     return;
   }
   DeleteFramebuffersHelper(n, framebuffers);
-  helper_->DeleteFramebuffersImmediate(n, framebuffers);
-  Flush();
 }
 
 void DeleteProgram(GLuint program) {
   GPU_CLIENT_LOG("[" << this << "] glDeleteProgram(" << program << ")");
   GPU_CLIENT_DCHECK(program != 0);
-  program_and_shader_id_handler_->FreeIds(1, &program);
-  helper_->DeleteProgram(program);
-  Flush();
+  DeleteProgramHelper(program);
 }
 
 void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) {
   GPU_CLIENT_LOG("[" << this << "] glDeleteRenderbuffers(" << n << ", " << static_cast<const void*>(renderbuffers) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << renderbuffers[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_DCHECK(renderbuffers[i] != 0);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteRenderbuffers: n < 0");
     return;
   }
   DeleteRenderbuffersHelper(n, renderbuffers);
-  helper_->DeleteRenderbuffersImmediate(n, renderbuffers);
-  Flush();
 }
 
 void DeleteShader(GLuint shader) {
   GPU_CLIENT_LOG("[" << this << "] glDeleteShader(" << shader << ")");
   GPU_CLIENT_DCHECK(shader != 0);
-  program_and_shader_id_handler_->FreeIds(1, &shader);
-  helper_->DeleteShader(shader);
-  Flush();
+  DeleteShaderHelper(shader);
 }
 
 void DeleteTextures(GLsizei n, const GLuint* textures) {
   GPU_CLIENT_LOG("[" << this << "] glDeleteTextures(" << n << ", " << static_cast<const void*>(textures) << ")");  // NOLINT
   GPU_CLIENT_LOG_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_CLIENT_LOG("  " << i << ": " << textures[i]);
     }
   });
   GPU_CLIENT_DCHECK_CODE_BLOCK({
     for (GLsizei i = 0; i < n; ++i) {
       GPU_DCHECK(textures[i] != 0);
     }
   });
   if (n < 0) {
     SetGLError(GL_INVALID_VALUE, "glDeleteTextures: n < 0");
     return;
   }
   DeleteTexturesHelper(n, textures);
-  helper_->DeleteTexturesImmediate(n, textures);
-  Flush();
 }
 
 void DepthFunc(GLenum func) {
   GPU_CLIENT_LOG("[" << this << "] glDepthFunc(" << GLES2Util::GetStringCmpFunction(func) << ")");  // NOLINT
   helper_->DepthFunc(func);
 }
 
 void DepthMask(GLboolean flag) {
   GPU_CLIENT_LOG("[" << this << "] glDepthMask(" << GLES2Util::GetStringBool(
       flag) << ")");
@@ skipping 249 matching lines @@
 void GetProgramInfoLog(
     GLuint program, GLsizei bufsize, GLsizei* length, char* infolog) {
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLsizei, length);
   GPU_CLIENT_LOG("[" << this << "] glGetProgramInfoLog" << "("
       << program << ", "
       << bufsize << ", "
       << static_cast<void*>(length) << ", "
       << static_cast<void*>(infolog) << ")");
   helper_->SetBucketSize(kResultBucketId, 0);
   helper_->GetProgramInfoLog(program, kResultBucketId);
-  if (bufsize > 0) {
-    std::string str;
-    if (GetBucketAsString(kResultBucketId, &str)) {
-      GLsizei max_size =
+  std::string str;
+  GLsizei max_size = 0;
+  if (GetBucketAsString(kResultBucketId, &str)) {
+    if (bufsize > 0) {
+      max_size =
           std::min(static_cast<size_t>(bufsize) - 1, str.size());
-      if (length != NULL) {
-        *length = max_size;
-      }
       memcpy(infolog, str.c_str(), max_size);
       infolog[max_size] = '\0';
       GPU_CLIENT_LOG("------\n" << infolog << "\n------");
     }
   }
+  if (length != NULL) {
+    *length = max_size;
+  }
 }
 void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params) {
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLint, params);
   GPU_CLIENT_LOG("[" << this << "] glGetRenderbufferParameteriv(" << GLES2Util::GetStringRenderBufferTarget(target) << ", " << GLES2Util::GetStringRenderBufferParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
   if (GetRenderbufferParameterivHelper(target, pname, params)) {
     return;
   }
   typedef GetRenderbufferParameteriv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
@@ skipping 29 matching lines @@
 void GetShaderInfoLog(
     GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog) {
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLsizei, length);
   GPU_CLIENT_LOG("[" << this << "] glGetShaderInfoLog" << "("
       << shader << ", "
       << bufsize << ", "
       << static_cast<void*>(length) << ", "
       << static_cast<void*>(infolog) << ")");
   helper_->SetBucketSize(kResultBucketId, 0);
   helper_->GetShaderInfoLog(shader, kResultBucketId);
-  if (bufsize > 0) {
-    std::string str;
-    if (GetBucketAsString(kResultBucketId, &str)) {
-      GLsizei max_size =
+  std::string str;
+  GLsizei max_size = 0;
+  if (GetBucketAsString(kResultBucketId, &str)) {
+    if (bufsize > 0) {
+      max_size =
           std::min(static_cast<size_t>(bufsize) - 1, str.size());
-      if (length != NULL) {
-        *length = max_size;
-      }
       memcpy(infolog, str.c_str(), max_size);
       infolog[max_size] = '\0';
       GPU_CLIENT_LOG("------\n" << infolog << "\n------");
     }
   }
+  if (length != NULL) {
+    *length = max_size;
+  }
 }
 void GetShaderPrecisionFormat(
     GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
 
 void GetShaderSource(
     GLuint shader, GLsizei bufsize, GLsizei* length, char* source) {
   GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION(GLsizei, length);
   GPU_CLIENT_LOG("[" << this << "] glGetShaderSource" << "("
       << shader << ", "
       << bufsize << ", "
       << static_cast<void*>(length) << ", "
       << static_cast<void*>(source) << ")");
   helper_->SetBucketSize(kResultBucketId, 0);
   helper_->GetShaderSource(shader, kResultBucketId);
-  if (bufsize > 0) {
-    std::string str;
-    if (GetBucketAsString(kResultBucketId, &str)) {
-      GLsizei max_size =
+  std::string str;
+  GLsizei max_size = 0;
+  if (GetBucketAsString(kResultBucketId, &str)) {
+    if (bufsize > 0) {
+      max_size =
           std::min(static_cast<size_t>(bufsize) - 1, str.size());
-      if (length != NULL) {
-        *length = max_size;
-      }
       memcpy(source, str.c_str(), max_size);
       source[max_size] = '\0';
       GPU_CLIENT_LOG("------\n" << source << "\n------");
     }
   }
+  if (length != NULL) {
+    *length = max_size;
+  }
 }
 const GLubyte* GetString(GLenum name);
 
 void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) {
   GPU_CLIENT_LOG("[" << this << "] glGetTexParameterfv(" << GLES2Util::GetStringTextureTarget(target) << ", " << GLES2Util::GetStringTextureParameter(pname) << ", " << static_cast<const void*>(params) << ")");  // NOLINT
   if (GetTexParameterfvHelper(target, pname, params)) {
     return;
   }
   typedef GetTexParameterfv::Result Result;
   Result* result = GetResultAs<Result*>();
@@ skipping 116 matching lines @@
   WaitForCmd();
   GPU_CLIENT_LOG("returned " << *result);
   return *result;
 }
 
 void LineWidth(GLfloat width) {
   GPU_CLIENT_LOG("[" << this << "] glLineWidth(" << width << ")");
   helper_->LineWidth(width);
 }
 
-void LinkProgram(GLuint program) {
-  GPU_CLIENT_LOG("[" << this << "] glLinkProgram(" << program << ")");
-  helper_->LinkProgram(program);
-}
+void LinkProgram(GLuint program);
 
 void PixelStorei(GLenum pname, GLint param);
 
 void PolygonOffset(GLfloat factor, GLfloat units) {
   GPU_CLIENT_LOG("[" << this << "] glPolygonOffset(" << factor << ", " << units << ")");  // NOLINT
   helper_->PolygonOffset(factor, units);
 }
 
 void ReadPixels(
     GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
@@ skipping 457 matching lines @@
 }
 
 void GetMultipleIntegervCHROMIUM(
     const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size);
 
 void GetProgramInfoCHROMIUM(
     GLuint program, GLsizei bufsize, GLsizei* size, void* info);
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_