Set correct internalformat info for TexStorageEXT according context type

gpu/command_buffer/service/gles2_cmd_decoder.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/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 16627 matching lines @@
                    depth);
   }
   if (workarounds().reset_base_mipmap_level_before_texstorage &&
       texture->base_level() > 0)
     glTexParameteri(target, GL_TEXTURE_BASE_LEVEL, texture->base_level());
 
   {
     GLsizei level_width = width;
     GLsizei level_height = height;
     GLsizei level_depth = depth;
-    GLenum adjusted_format = internal_format;
-#if defined(OS_MACOSX)
-    // TODO(dshwang): remove it after fixing the root cause. crbug.com/657532
-    adjusted_format = feature_info_->IsES3Enabled() ? internal_format : format;
-#endif

[Zhenyao Mo, 2016/10/31 18:14:40]

I agree with Dongseong. Now you found the root problem in Mac, you can just
remove this OS_MACOSX special hack, and get rid of the adjusted_format, and
simply use internal_format below.

-
+    GLenum adjusted_internal_format =
+        feature_info_->context_type() == CONTEXT_TYPE_OPENGLES2 ?
+        format : internal_format;
     for (int ii = 0; ii < levels; ++ii) {
       if (target == GL_TEXTURE_CUBE_MAP) {
         for (int jj = 0; jj < 6; ++jj) {
           GLenum face = GL_TEXTURE_CUBE_MAP_POSITIVE_X + jj;
           texture_manager()->SetLevelInfo(
-              texture_ref, face, ii, adjusted_format, level_width, level_height,
-              1, 0, format, type, gfx::Rect());
+              texture_ref, face, ii, adjusted_internal_format, level_width,
+              level_height, 1, 0, format, type, gfx::Rect());
         }
       } else {
         texture_manager()->SetLevelInfo(
-            texture_ref, target, ii, adjusted_format, level_width, level_height,
-            level_depth, 0, format, type, gfx::Rect());
+            texture_ref, target, ii, adjusted_internal_format, level_width,
+            level_height, level_depth, 0, format, type, gfx::Rect());
       }
       level_width = std::max(1, level_width >> 1);
       level_height = std::max(1, level_height >> 1);
       if (target == GL_TEXTURE_3D)
         level_depth = std::max(1, level_depth >> 1);
     }
     texture->SetImmutable(true);
   }
 }
 
@@ skipping 2084 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu