Improve detail of some texture-related errors.

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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2136 matching lines @@
   }
   if (!validators->pixel_type.IsValid(type)) {
     ERRORSTATE_SET_GL_ERROR_INVALID_ENUM(
         error_state, function_name, type, "type");
     return false;
   }
   // For TexSubImage calls, internal_format isn't part of the parameters.
   // So the validation is not necessary for TexSubImage.
   if (tex_image_call &&
       !validators->texture_internal_format.IsValid(internal_format)) {
-    ERRORSTATE_SET_GL_ERROR(
-        error_state, GL_INVALID_VALUE, function_name,
-        "invalid internal_format");
+    std::string msg = base::StringPrintf("invalid internal_format 0x%x",
+                                         internal_format);
+    ERRORSTATE_SET_GL_ERROR(error_state, GL_INVALID_VALUE, function_name,
+                             msg.c_str());
     return false;
   }
   if (!g_format_type_validator.Get().IsValid(internal_format, format, type)) {
-    ERRORSTATE_SET_GL_ERROR(
-        error_state, GL_INVALID_OPERATION, function_name,
-        "invalid internalformat/format/type combination");
+    std::string msg = base::StringPrintf(
+        "invalid internalformat/format/type combination 0x%x/0x%x/0x%x",
+        internal_format, format, type);
+    ERRORSTATE_SET_GL_ERROR(error_state, GL_INVALID_OPERATION, function_name,
+                            msg.c_str());
     return false;
   }
   if (!feature_info_->IsES3Enabled()) {
     uint32_t channels = GLES2Util::GetChannelsForFormat(format);
     if ((channels & (GLES2Util::kDepth | GLES2Util::kStencil)) != 0 && level) {
       ERRORSTATE_SET_GL_ERROR(
           error_state, GL_INVALID_OPERATION, function_name,
           (std::string("invalid format ") + GLES2Util::GetStringEnum(format) +
            " for level != 0").c_str());
       return false;
@@ skipping 265 matching lines @@
   if (!local_texture_ref) {
     ERRORSTATE_SET_GL_ERROR(error_state, GL_INVALID_OPERATION, function_name,
                             "unknown texture for target");
     return false;
   }
   Texture* texture = local_texture_ref->texture();
   GLenum current_type = 0;
   GLenum internal_format = 0;
   if (!texture->GetLevelType(args.target, args.level, &current_type,
                              &internal_format)) {
+    std::string msg = base::StringPrintf(
+        "level %d does not exist", args.level);
     ERRORSTATE_SET_GL_ERROR(error_state, GL_INVALID_OPERATION, function_name,
-                            "level does not exist.");
+                            msg.c_str());
     return false;
   }
   if (!ValidateTextureParameters(error_state, function_name, false, args.format,
                                  args.type, internal_format, args.level)) {
     return false;
   }
   if (args.type != current_type && !feature_info_->IsES3Enabled()) {
     // It isn't explicitly required in the ES2 spec, but some drivers generate
     // an error. It is better to be consistent across drivers.
     ERRORSTATE_SET_GL_ERROR(error_state, GL_INVALID_OPERATION, function_name,
@@ skipping 729 matching lines @@
 uint32_t TextureManager::GetServiceIdGeneration() const {
   return current_service_id_generation_;
 }
 
 void TextureManager::IncrementServiceIdGeneration() {
   current_service_id_generation_++;
 }
 
 }  // namespace gles2
 }  // namespace gpu