Type conversion fixes, gpu/ edition.

gpu/command_buffer/service/texture_manager.cc

 // Copyright (c) 2012 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/texture_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bits.h"
@@ skipping 1274 matching lines @@
 
 void TextureManager::SetParameterf(
     const char* function_name, ErrorState* error_state,
     TextureRef* ref, GLenum pname, GLfloat param) {
   DCHECK(error_state);
   DCHECK(ref);
   Texture* texture = ref->texture();
   GLenum result = texture->SetParameterf(feature_info_.get(), pname, param);
   if (result != GL_NO_ERROR) {
     if (result == GL_INVALID_ENUM) {
-      ERRORSTATE_SET_GL_ERROR_INVALID_ENUM(
-          error_state, function_name, param, "param");

[no sievers, 2014/10/16 23:52:08]

I think this is a typo here. If the error is INVALID_ENUM, you want to log
|pname|. See error_state.cc SetGLErrorInvalidEnum() which converts tries to
convert this enum to a string.

[Peter Kasting, 2014/10/17 00:00:40]

So, like this?:

      ERRORSTATE_SET_GL_ERROR_INVALID_ENUM(
          error_state, function_name, pname, "pname");

[no sievers, 2014/10/17 00:06:24]

Yes.

+      ERRORSTATE_SET_GL_ERROR_INVALID_ENUM(error_state, function_name,
+                                           static_cast<unsigned int>(param),
+                                           "param");
     } else {
       ERRORSTATE_SET_GL_ERROR_INVALID_PARAMF(
           error_state, result, function_name, pname, param);
     }
   } else {
     // Texture tracking pools exist only for the command decoder, so
     // do not pass them on to the native GL implementation.
     if (pname != GL_TEXTURE_POOL_CHROMIUM) {
       glTexParameterf(texture->target(), pname, param);
     }
@@ skipping 413 matching lines @@
 }
 
 ScopedTextureUploadTimer::~ScopedTextureUploadTimer() {
   texture_state_->texture_upload_count++;
   texture_state_->total_texture_upload_time +=
       base::TimeTicks::HighResNow() - begin_time_;
 }
 
 }  // namespace gles2
 }  // namespace gpu