WebGL TexParameterf and GetTexParameterf needs to handle float param correctly

gpu/command_buffer/service/error_state.cc

Index: gpu/command_buffer/service/error_state.cc
diff --git a/gpu/command_buffer/service/error_state.cc b/gpu/command_buffer/service/error_state.cc
index 524ea4f79ec770374f0e3feeb2af1e95e41221f8..b8cb85167f00f0068bf758a57b945162ab26dcf1 100644
--- a/gpu/command_buffer/service/error_state.cc
+++ b/gpu/command_buffer/service/error_state.cc
@@ -33,13 +33,20 @@ class ErrorStateImpl : public ErrorState {
       const char* function_name,
       unsigned int value,
       const char* label) OVERRIDE;
-  virtual void SetGLErrorInvalidParam(
+  virtual void SetGLErrorInvalidParami(
       const char* filename,
       int line,
       unsigned int error,
       const char* function_name,
       unsigned int pname,
       int param) OVERRIDE;
+  virtual void SetGLErrorInvalidParamf(
+      const char* filename,
+      int line,
+      unsigned int error,
+      const char* function_name,
+      unsigned int pname,
+      float param) OVERRIDE;
 
   virtual unsigned int PeekGLError(
       const char* filename, int line, const char* function_name) OVERRIDE;
@@ -131,7 +138,7 @@ void ErrorStateImpl::SetGLErrorInvalidEnum(
              GLES2Util::GetStringEnum(value)).c_str());
 }
 
-void ErrorStateImpl::SetGLErrorInvalidParam(
+void ErrorStateImpl::SetGLErrorInvalidParami(

[Ken Russell (switch to Gerrit), 2014/03/07 19:28:31]

Let's reduce code duplication here either by making SetGLErrorInvalidParam a
template function, or making a SetGLErrorInvalidParamImpl template function
(parameterizing the type of "param" and having SetGLErrorInvalidParami and
SetGLErrorInvalidParamf be simple wrappers for it.

[Zhenyao Mo, 2014/03/07 21:31:23]

Just realized for the float one, we don't need some of the code.  So I think we
can keep two function implementations, as the float version is just one
statement.

     const char* filename,
     int line,
     unsigned int error,
@@ -152,6 +159,27 @@ void ErrorStateImpl::SetGLErrorInvalidParam(
   }
 }
 
+void ErrorStateImpl::SetGLErrorInvalidParamf(
+    const char* filename,
+    int line,
+    unsigned int error,
+    const char* function_name,
+    unsigned int pname, float param) {
+  if (error == GL_INVALID_ENUM) {
+    SetGLError(
+        filename, line, GL_INVALID_ENUM, function_name,
+        (std::string("trying to set ") +
+         GLES2Util::GetStringEnum(pname) + " to " +
+         GLES2Util::GetStringEnum(param)).c_str());
+  } else {
+    SetGLError(
+        filename, line, error, function_name,
+        (std::string("trying to set ") +
+         GLES2Util::GetStringEnum(pname) + " to " +
+         base::StringPrintf("%G", param)).c_str());
+  }
+}
+
 void ErrorStateImpl::CopyRealGLErrorsToWrapper(
     const char* filename, int line, const char* function_name) {
   GLenum error;