Reverting commit 44334

TEST=none
BUG=none
TBR=dumi@chromium.org


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44335 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 58 insertions, 52 deletions

diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
index 9938cb8..04e5d76 100644
--- a/gpu/command_buffer/client/gles2_implementation_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
@@ -19,36 +19,19 @@ void AttachShader(GLuint program, GLuint shader) {
 
 void BindAttribLocation(GLuint program, GLuint index, const char* name);
 
+void BindBuffer(GLenum target, GLuint buffer) {
+  helper_->BindBuffer(target, buffer);
+}
+
 void BindFramebuffer(GLenum target, GLuint framebuffer) {
-  if (IsReservedId(framebuffer)) {
-    SetGLError(GL_INVALID_OPERATION);
-    return;
-  }
-  if (framebuffer != 0) {
-    id_allocator_.MarkAsUsed(framebuffer);
-  }
   helper_->BindFramebuffer(target, framebuffer);
 }
 
 void BindRenderbuffer(GLenum target, GLuint renderbuffer) {
-  if (IsReservedId(renderbuffer)) {
-    SetGLError(GL_INVALID_OPERATION);
-    return;
-  }
-  if (renderbuffer != 0) {
-    id_allocator_.MarkAsUsed(renderbuffer);
-  }
   helper_->BindRenderbuffer(target, renderbuffer);
 }
 
 void BindTexture(GLenum target, GLuint texture) {
-  if (IsReservedId(texture)) {
-    SetGLError(GL_INVALID_OPERATION);
-    return;
-  }
-  if (texture != 0) {
-    id_allocator_.MarkAsUsed(texture);
-  }
   helper_->BindTexture(target, texture);
 }
 
@@ -170,6 +153,11 @@ void CullFace(GLenum mode) {
   helper_->CullFace(mode);
 }
 
+void DeleteBuffers(GLsizei n, const GLuint* buffers) {
+  FreeIds(n, buffers);
+  helper_->DeleteBuffersImmediate(n, buffers);
+}
+
 void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) {
   FreeIds(n, framebuffers);
   helper_->DeleteFramebuffersImmediate(n, framebuffers);
@@ -213,6 +201,18 @@ void Disable(GLenum cap) {
   helper_->Disable(cap);
 }
 
+void DisableVertexAttribArray(GLuint index) {
+  helper_->DisableVertexAttribArray(index);
+}
+
+void DrawArrays(GLenum mode, GLint first, GLsizei count) {
+  if (count < 0) {
+    SetGLError(GL_INVALID_VALUE);
+    return;
+  }
+  helper_->DrawArrays(mode, first, count);
+}
+
 void DrawElements(
     GLenum mode, GLsizei count, GLenum type, const void* indices);
 
@@ -220,6 +220,10 @@ void Enable(GLenum cap) {
   helper_->Enable(cap);
 }
 
+void EnableVertexAttribArray(GLuint index) {
+  helper_->EnableVertexAttribArray(index);
+}
+
 void Finish();
 
 void Flush();
@@ -282,8 +286,7 @@ void GetBooleanv(GLenum pname, GLboolean* params) {
   typedef GetBooleanv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetBooleanv(pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetBooleanv(pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -291,8 +294,8 @@ void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params) {
   typedef GetBufferParameteriv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetBufferParameteriv(target, pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetBufferParameteriv(
+      target, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -302,8 +305,7 @@ void GetFloatv(GLenum pname, GLfloat* params) {
   typedef GetFloatv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetFloatv(pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetFloatv(pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -312,8 +314,8 @@ void GetFramebufferAttachmentParameteriv(
   typedef GetFramebufferAttachmentParameteriv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetFramebufferAttachmentParameteriv(target, attachment, pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetFramebufferAttachmentParameteriv(
+      target, attachment, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -321,8 +323,7 @@ void GetIntegerv(GLenum pname, GLint* params) {
   typedef GetIntegerv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetIntegerv(pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetIntegerv(pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -330,8 +331,7 @@ void GetProgramiv(GLuint program, GLenum pname, GLint* params) {
   typedef GetProgramiv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetProgramiv(program, pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetProgramiv(program, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -356,8 +356,8 @@ void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params) {
   typedef GetRenderbufferParameteriv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetRenderbufferParameteriv(target, pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetRenderbufferParameteriv(
+      target, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -365,8 +365,7 @@ void GetShaderiv(GLuint shader, GLenum pname, GLint* params) {
   typedef GetShaderiv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetShaderiv(shader, pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetShaderiv(shader, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -413,8 +412,8 @@ void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) {
   typedef GetTexParameterfv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetTexParameterfv(target, pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetTexParameterfv(
+      target, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -422,8 +421,8 @@ void GetTexParameteriv(GLenum target, GLenum pname, GLint* params) {
   typedef GetTexParameteriv::Result Result;
   Result* result = GetResultAs<Result*>();
   result->SetNumResults(0);
-  helper_->GetTexParameteriv(target, pname,
-      result_shm_id(), result_shm_offset());
+  helper_->GetTexParameteriv(
+      target, pname, result_shm_id(), result_shm_offset());
   WaitForCmd();
   result->CopyResult(params);
 }
@@ -433,6 +432,24 @@ void GetUniformiv(GLuint program, GLint location, GLint* params);
 
 GLint GetUniformLocation(GLuint program, const char* name);
 
+void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) {
+  typedef GetVertexAttribfv::Result Result;
+  Result* result = GetResultAs<Result*>();
+  result->SetNumResults(0);
+  helper_->GetVertexAttribfv(
+      index, pname, result_shm_id(), result_shm_offset());
+  WaitForCmd();
+  result->CopyResult(params);
+}
+void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params) {
+  typedef GetVertexAttribiv::Result Result;
+  Result* result = GetResultAs<Result*>();
+  result->SetNumResults(0);
+  helper_->GetVertexAttribiv(
+      index, pname, result_shm_id(), result_shm_offset());
+  WaitForCmd();
+  result->CopyResult(params);
+}
 void GetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer);
 
 void Hint(GLenum target, GLenum mode) {
@@ -746,16 +763,5 @@ void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) {
 
 void SwapBuffers();
 
-GLuint GetMaxValueInBuffer(
-    GLuint buffer_id, GLsizei count, GLenum type, GLuint offset) {
-  typedef GetMaxValueInBuffer::Result Result;
-  Result* result = GetResultAs<Result*>();
-  *result = 0;
-  helper_->GetMaxValueInBuffer(
-      buffer_id, count, type, offset, result_shm_id(), result_shm_offset());
-  WaitForCmd();
-  return *result;
-}
-
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_AUTOGEN_H_