WebGL TexParameterf and GetTexParameterf needs to handle float param correctly

gpu/command_buffer/service/error_state.cc

 // Copyright (c) 2013 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/error_state.h"
 
 #include <string>
 
 #include "base/strings/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ skipping 15 matching lines @@
       int line,
       unsigned int error,
       const char* function_name,
       const char* msg) OVERRIDE;
   virtual void SetGLErrorInvalidEnum(
       const char* filename,
       int line,
       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;
 
   virtual void CopyRealGLErrorsToWrapper(
       const char* filename, int line, const char* function_name) OVERRIDE;
 
   virtual void ClearRealGLErrors(
       const char* filename, int line, const char* function_name) OVERRIDE;
 
@@ skipping 71 matching lines @@
     const char* filename,
     int line,
     const char* function_name,
     unsigned int value,
     const char* label) {
   SetGLError(filename, line, GL_INVALID_ENUM, function_name,
              (std::string(label) + " was " +
              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,
     const char* function_name,
     unsigned int pname, int 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("%d", param)).c_str());
   }
 }
 
+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;
   while ((error = glGetError()) != GL_NO_ERROR) {
     SetGLError(filename, line, error, function_name,
                "<- error from previous GL command");
   }
 }
 
 void ErrorStateImpl::ClearRealGLErrors(
     const char* filename, int line, const char* function_name) {
   // Clears and logs all current gl errors.
   GLenum error;
   while ((error = glGetError()) != GL_NO_ERROR) {
     if (error != GL_OUT_OF_MEMORY) {
       // GL_OUT_OF_MEMORY can legally happen on lost device.
       logger_->LogMessage(
           filename, line,
           std::string("GL ERROR :") +
           GLES2Util::GetStringEnum(error) + " : " +
           function_name + ": was unhandled");
       NOTREACHED() << "GL error " << error << " was unhandled.";
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu