Enabled EXT_sRGB WebGL extension support in the command buffer.

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"
 #include "base/strings/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace gpu {
 namespace gles2 {
 
 // This should contain everything to uniquely identify a Texture.
 static const char TextureTag[] = "|Texture|";
 struct TextureSignature {
   GLenum target_;
   GLint level_;
   GLenum min_filter_;
@@ skipping 1603 matching lines @@
     const DoTextImage2DArguments& args) {
   TextureRef* texture_ref;
   if (!ValidateTexImage2D(state, "glTexImage2D", args, &texture_ref)) {
     return;
   }
 
   DoTexImage2D(texture_state, state->GetErrorState(), framebuffer_state,
                texture_ref, args);
 }
 
+GLenum TextureManager::AdjustTexFormat(GLenum format) const {
+  if (gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL) {

[Ken Russell (switch to Gerrit), 2014/10/11 03:20:43]

Is this going to have to change for the coming GLES3 upgrade too? If so is a
TODO warranted?

+    if (format == GL_SRGB_EXT)
+      return GL_RGB;
+    if (format == GL_SRGB_ALPHA_EXT)
+      return GL_RGBA;
+  }
+  return format;
+}
+
 void TextureManager::DoTexImage2D(
     DecoderTextureState* texture_state,
     ErrorState* error_state,
     DecoderFramebufferState* framebuffer_state,
     TextureRef* texture_ref,
     const DoTextImage2DArguments& args) {
   Texture* texture = texture_ref->texture();
   GLsizei tex_width = 0;
   GLsizei tex_height = 0;
   GLenum tex_type = 0;
@@ skipping 16 matching lines @@
 
   if (texture->IsAttachedToFramebuffer()) {
     framebuffer_state->clear_state_dirty = true;
   }
 
   if (texture_state->texsubimage2d_faster_than_teximage2d &&
       level_is_same && args.pixels) {
     {
       ScopedTextureUploadTimer timer(texture_state);
       glTexSubImage2D(args.target, args.level, 0, 0, args.width, args.height,
-                      args.format, args.type, args.pixels);
+                      AdjustTexFormat(args.format), args.type, args.pixels);
     }
     SetLevelCleared(texture_ref, args.target, args.level, true);
     texture_state->tex_image_2d_failed = false;
     return;
   }
 
   ERRORSTATE_COPY_REAL_GL_ERRORS_TO_WRAPPER(error_state, "glTexImage2D");
   {
     ScopedTextureUploadTimer timer(texture_state);
     glTexImage2D(
         args.target, args.level, args.internal_format, args.width, args.height,
-        args.border, args.format, args.type, args.pixels);
+        args.border, AdjustTexFormat(args.format), args.type, args.pixels);
   }
   GLenum error = ERRORSTATE_PEEK_GL_ERROR(error_state, "glTexImage2D");
   if (error == GL_NO_ERROR) {
     SetLevelInfo(
         texture_ref,
         args.target, args.level, args.internal_format, args.width, args.height,
         1, args.border, args.format, args.type, args.pixels != NULL);
     texture_state->tex_image_2d_failed = false;
   }
 }
 
 ScopedTextureUploadTimer::ScopedTextureUploadTimer(
     DecoderTextureState* texture_state)
     : texture_state_(texture_state),
       begin_time_(base::TimeTicks::HighResNow()) {
 }
 
 ScopedTextureUploadTimer::~ScopedTextureUploadTimer() {
   texture_state_->texture_upload_count++;
   texture_state_->total_texture_upload_time +=
       base::TimeTicks::HighResNow() - begin_time_;
 }
 
 }  // namespace gles2
 }  // namespace gpu