Change GLInternalFormat param from GLint to GLenum.

Original GLInternalFormat type is GLenum (http://goo.gl/fXcvqh).
But GLint is used in AsyncTexImage2DCHROMIUM params.
This is a patch for changing the type
from GLint to GLenum.

BUG=None

Review URL: https://codereview.chromium.org/333203003

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

12 files changed, 11 insertions, 13 deletions

diff --git a/cc/test/test_gles2_interface.cc b/cc/test/test_gles2_interface.cc
index 26055ba..cf28225 100644
--- a/cc/test/test_gles2_interface.cc
+++ b/cc/test/test_gles2_interface.cc
@@ -226,7 +226,7 @@ void TestGLES2Interface::TexParameteri(GLenum target,
 
 void TestGLES2Interface::AsyncTexImage2DCHROMIUM(GLenum target,
                                                  GLint level,
-                                                 GLint internalformat,
+                                                 GLenum internalformat,
                                                  GLsizei width,
                                                  GLsizei height,
                                                  GLint border,
diff --git a/cc/test/test_gles2_interface.h b/cc/test/test_gles2_interface.h
index 417bf4a..be18e73 100644
--- a/cc/test/test_gles2_interface.h
+++ b/cc/test/test_gles2_interface.h
@@ -99,7 +99,7 @@ class TestGLES2Interface : public gpu::gles2::GLES2InterfaceStub {
 
   virtual void AsyncTexImage2DCHROMIUM(GLenum target,
                                        GLint level,
-                                       GLint internalformat,
+                                       GLenum internalformat,
                                        GLsizei width,
                                        GLsizei height,
                                        GLint border,
diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
index e810d53..f59157d 100644
--- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
@@ -906,7 +906,7 @@ void GLES2AsyncTexSubImage2DCHROMIUM(GLenum target,
 }
 void GLES2AsyncTexImage2DCHROMIUM(GLenum target,
                                   GLint level,
-                                  GLint internalformat,
+                                  GLenum internalformat,
                                   GLsizei width,
                                   GLsizei height,
                                   GLint border,
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index f8a84ed..1a3bced 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -3858,7 +3858,7 @@ void GLES2Implementation::FreeAllAsyncUploadBuffers() {
 }
 
 void GLES2Implementation::AsyncTexImage2DCHROMIUM(
-    GLenum target, GLint level, GLint internalformat, GLsizei width,
+    GLenum target, GLint level, GLenum internalformat, GLsizei width,
     GLsizei height, GLint border, GLenum format, GLenum type,
     const void* pixels) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
index 35f1818..db6760e 100644
--- a/gpu/command_buffer/client/gles2_implementation_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
@@ -703,7 +703,7 @@ virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
 
 virtual void AsyncTexImage2DCHROMIUM(GLenum target,
                                      GLint level,
-                                     GLint internalformat,
+                                     GLenum internalformat,
                                      GLsizei width,
                                      GLsizei height,
                                      GLint border,
diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h
index 75efd8b..ad0a418 100644
--- a/gpu/command_buffer/client/gles2_interface_autogen.h
+++ b/gpu/command_buffer/client/gles2_interface_autogen.h
@@ -476,7 +476,7 @@ virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
                                         const void* data) = 0;
 virtual void AsyncTexImage2DCHROMIUM(GLenum target,
                                      GLint level,
-                                     GLint internalformat,
+                                     GLenum internalformat,
                                      GLsizei width,
                                      GLsizei height,
                                      GLint border,
diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
index 4a09911..25bdd96 100644
--- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h
+++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
@@ -509,7 +509,7 @@ virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
                                         const void* data) OVERRIDE;
 virtual void AsyncTexImage2DCHROMIUM(GLenum target,
                                      GLint level,
-                                     GLint internalformat,
+                                     GLenum internalformat,
                                      GLsizei width,
                                      GLsizei height,
                                      GLint border,
diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
index db4c0c2..4e83921 100644
--- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
+++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
@@ -818,7 +818,7 @@ void GLES2InterfaceStub::AsyncTexSubImage2DCHROMIUM(GLenum /* target */,
 }
 void GLES2InterfaceStub::AsyncTexImage2DCHROMIUM(GLenum /* target */,
                                                  GLint /* level */,
-                                                 GLint /* internalformat */,
+                                                 GLenum /* internalformat */,
                                                  GLsizei /* width */,
                                                  GLsizei /* height */,
                                                  GLint /* border */,
diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
index 22df63e..b40ae9a4 100644
--- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
+++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
@@ -509,7 +509,7 @@ virtual void AsyncTexSubImage2DCHROMIUM(GLenum target,
                                         const void* data) OVERRIDE;
 virtual void AsyncTexImage2DCHROMIUM(GLenum target,
                                      GLint level,
-                                     GLint internalformat,
+                                     GLenum internalformat,
                                      GLsizei width,
                                      GLsizei height,
                                      GLint border,
diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
index 2d88aee..ec4a365 100644
--- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
+++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
@@ -1433,7 +1433,7 @@ void GLES2TraceImplementation::AsyncTexSubImage2DCHROMIUM(GLenum target,
 
 void GLES2TraceImplementation::AsyncTexImage2DCHROMIUM(GLenum target,
                                                        GLint level,
-                                                       GLint internalformat,
+                                                       GLenum internalformat,
                                                        GLsizei width,
                                                        GLsizei height,
                                                        GLint border,
diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt
index 4c3aa98..05cbd12 100644
--- a/gpu/command_buffer/cmd_buffer_functions.txt
+++ b/gpu/command_buffer/cmd_buffer_functions.txt
@@ -213,7 +213,7 @@ GL_APICALL void         GL_APIENTRY glReleaseTexImage2DCHROMIUM (GLenumTextureBi
 GL_APICALL void         GL_APIENTRY glTraceBeginCHROMIUM (const char* name);
 GL_APICALL void         GL_APIENTRY glTraceEndCHROMIUM (void);
 GL_APICALL void         GL_APIENTRY glAsyncTexSubImage2DCHROMIUM (GLenumTextureTarget target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenumTextureFormat format, GLenumPixelType type, const void* data);
-GL_APICALL void         GL_APIENTRY glAsyncTexImage2DCHROMIUM (GLenumTextureTarget target, GLint level, GLintTextureInternalFormat internalformat, GLsizei width, GLsizei height, GLintTextureBorder border, GLenumTextureFormat format, GLenumPixelType type, const void* pixels);
+GL_APICALL void         GL_APIENTRY glAsyncTexImage2DCHROMIUM (GLenumTextureTarget target, GLint level, GLenumTextureInternalFormat internalformat, GLsizei width, GLsizei height, GLintTextureBorder border, GLenumTextureFormat format, GLenumPixelType type, const void* pixels);
 GL_APICALL void         GL_APIENTRY glWaitAsyncTexImage2DCHROMIUM (GLenumTextureTarget target);
 GL_APICALL void         GL_APIENTRY glWaitAllAsyncTexImage2DCHROMIUM (void);
 GL_APICALL void         GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei count, const GLenum* attachments);
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 069ca52..95b92ec 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -10558,8 +10558,6 @@ error::Error GLES2DecoderImpl::HandleAsyncTexImage2DCHROMIUM(
   TRACE_EVENT0("gpu", "GLES2DecoderImpl::HandleAsyncTexImage2DCHROMIUM");
   GLenum target = static_cast<GLenum>(c.target);
   GLint level = static_cast<GLint>(c.level);
-  // TODO(kloveless): Change HandleAsyncTexImage2DCHROMIUM command to use
-  // unsigned integer for internalformat.
   GLenum internal_format = static_cast<GLenum>(c.internalformat);
   GLsizei width = static_cast<GLsizei>(c.width);
   GLsizei height = static_cast<GLsizei>(c.height);