Implement the texture uploading of ASTC compression for WebGL

gpu/command_buffer/service/feature_info.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/feature_info.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 127 matching lines @@
       enable_texture_float_linear(false),
       enable_texture_half_float_linear(false),
       angle_translated_shader_source(false),
       angle_pack_reverse_row_order(false),
       arb_texture_rectangle(false),
       angle_instanced_arrays(false),
       occlusion_query_boolean(false),
       use_arb_occlusion_query2_for_occlusion_query_boolean(false),
       use_arb_occlusion_query_for_occlusion_query_boolean(false),
       native_vertex_array_object(false),
+      ext_texture_format_astc(false),
       ext_texture_format_atc(false),
       ext_texture_format_bgra8888(false),
       ext_texture_format_dxt1(false),
       ext_texture_format_dxt5(false),
       enable_shader_name_hashing(false),
       enable_samplers(false),
       ext_draw_buffers(false),
       nv_draw_buffers(false),
       ext_frag_depth(false),
       ext_shader_texture_lod(false),
@@ skipping 219 matching lines @@
     // The difference between GL_EXT_texture_compression_s3tc and
     // GL_CHROMIUM_texture_compression_dxt5 is that the former
     // requires on the fly compression. The latter does not.
     AddExtensionString("GL_CHROMIUM_texture_compression_dxt5");
     validators_.compressed_texture_format.AddValue(
         GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
     validators_.texture_internal_format_storage.AddValue(
         GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
   }
 
+  bool have_astc = extensions.Contains("GL_OES_texture_compression_astc") ||

[Ken Russell (switch to Gerrit), 2015/08/07 22:32:33]

I don't think we should reference the GL_OES_texture_compression_atc extension
now that it's been superseded by the KHR version.

+                   extensions.Contains("GL_KHR_texture_compression_astc_ldr");
+  if (have_astc) {
+    feature_flags_.ext_texture_format_astc = true;
+    AddExtensionString("GL_KHR_texture_compression_astc_ldr");
+
+    GLint astc_rgba_type_max =
+        (GL_COMPRESSED_RGBA_ASTC_12x12_KHR -
+        GL_COMPRESSED_RGBA_ASTC_4x4_KHR);
+    GLint astc_srgba_type_max =
+        (GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR -
+        GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR);
+
+    // GL_COMPRESSED_RGBA_ASTC
+    for (GLint i = 0; i <= astc_rgba_type_max; i++) {

[Ken Russell (switch to Gerrit), 2015/08/07 22:32:33]

Why not just iterate from COMPRESSED_RGBA_ASTC_4x4_KHR to
COMPRESSED_RGBA_ASTC_12x12_KHR and add all of those values?

+        GLint format = GL_COMPRESSED_RGBA_ASTC_4x4_KHR + i;
+        validators_.compressed_texture_format.AddValue(format);
+    }
+    // GL_COMPRESSED_SRGB8_ALPHA8_ASTC
+    for (GLint i = 0; i <= astc_srgba_type_max; i++) {
+        GLint format = GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR + i;
+        validators_.compressed_texture_format.AddValue(format);
+    }
+  }
+
   bool have_atc = extensions.Contains("GL_AMD_compressed_ATC_texture") ||
                   extensions.Contains("GL_ATI_texture_compression_atitc");
   if (have_atc) {
     feature_flags_.ext_texture_format_atc = true;
 
     AddExtensionString("GL_AMD_compressed_ATC_texture");
     validators_.compressed_texture_format.AddValue(GL_ATC_RGB_AMD);
     validators_.compressed_texture_format.AddValue(
         GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD);
 
@@ skipping 772 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu