Implement the texture uploading of ASTC compression for WebGL(part II)

Source/modules/webgl/WebGLCompressedTextureASTC.cpp

Index: Source/modules/webgl/WebGLCompressedTextureASTC.cpp
diff --git a/Source/modules/webgl/WebGLCompressedTextureASTC.cpp b/Source/modules/webgl/WebGLCompressedTextureASTC.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..63a875ae97a1dc16e8c742c12a0880f09bcbea94
--- /dev/null
+++ b/Source/modules/webgl/WebGLCompressedTextureASTC.cpp
@@ -0,0 +1,74 @@
+// Copyright 2015 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 "config.h"
+
+#include "modules/webgl/WebGLCompressedTextureASTC.h"
+
+#include "modules/webgl/WebGLRenderingContextBase.h"
+
+namespace blink {
+
+const WebGLCompressedTextureASTC::BlockSizeCompressASTC
+    WebGLCompressedTextureASTC::kBlockSizeCompressASTC[] =
+    {
+        GL_COMPRESSED_RGBA_ASTC_4x4_KHR,           4, 4,
+        GL_COMPRESSED_RGBA_ASTC_5x4_KHR,           5, 4,
+        GL_COMPRESSED_RGBA_ASTC_5x5_KHR,           5, 5,
+        GL_COMPRESSED_RGBA_ASTC_6x5_KHR,           6, 5,
+        GL_COMPRESSED_RGBA_ASTC_6x6_KHR,           6, 6,
+        GL_COMPRESSED_RGBA_ASTC_8x5_KHR,           8, 5,
+        GL_COMPRESSED_RGBA_ASTC_8x6_KHR,           8, 6,
+        GL_COMPRESSED_RGBA_ASTC_8x8_KHR,           8, 8,
+        GL_COMPRESSED_RGBA_ASTC_10x5_KHR,          10, 5,
+        GL_COMPRESSED_RGBA_ASTC_10x6_KHR,          10, 6,
+        GL_COMPRESSED_RGBA_ASTC_10x8_KHR,          10, 8,
+        GL_COMPRESSED_RGBA_ASTC_10x10_KHR,         10, 10,
+        GL_COMPRESSED_RGBA_ASTC_12x10_KHR,         12, 10,
+        GL_COMPRESSED_RGBA_ASTC_12x12_KHR,         12, 12,
+    };
+
+const int WebGLCompressedTextureASTC::kSizeOfBlockSizeCompressASTC =

[Ken Russell (switch to Gerrit), 2015/08/18 00:05:02]

Please use arraysize(WebGLCompressedTextureASTC::BlockSizeCompressASTC) instead,
as is done in several other places.

+    sizeof(WebGLCompressedTextureASTC::kBlockSizeCompressASTC) /
+    sizeof(WebGLCompressedTextureASTC::kBlockSizeCompressASTC[0]);
+
+WebGLCompressedTextureASTC::WebGLCompressedTextureASTC(WebGLRenderingContextBase* context)
+    : WebGLExtension(context)
+{
+    for (int i = 0; i < WebGLCompressedTextureASTC::kSizeOfBlockSizeCompressASTC; i++) {
+        /* GL_COMPRESSED_RGBA_ASTC(0x93B0 ~ 0x93BD) */
+        context->addCompressedTextureFormat(
+            WebGLCompressedTextureASTC::kBlockSizeCompressASTC[i].CompressType);
+        /* GL_COMPRESSED_SRGB8_ALPHA8_ASTC(0x93D0 ~ 0x93DD) */
+        context->addCompressedTextureFormat(
+            WebGLCompressedTextureASTC::kBlockSizeCompressASTC[i].CompressType + 20);

[Ken Russell (switch to Gerrit), 2015/08/18 00:05:02]

This addition looks wrong -- I think it should be 0x20, not 20. For exactly this
reason, please at least compute it, rather than hardcoding the contant.

+    }
+}
+
+WebGLCompressedTextureASTC::~WebGLCompressedTextureASTC()
+{
+}
+
+WebGLExtensionName WebGLCompressedTextureASTC::name() const
+{
+    return WebGLCompressedTextureASTCName;
+}
+
+PassRefPtrWillBeRawPtr<WebGLCompressedTextureASTC> WebGLCompressedTextureASTC::create(WebGLRenderingContextBase* context)
+{
+    return adoptRefWillBeNoop(new WebGLCompressedTextureASTC(context));
+}
+
+bool WebGLCompressedTextureASTC::supported(WebGLRenderingContextBase* context)
+{
+    Extensions3DUtil* extensionsUtil = context->extensionsUtil();
+    return extensionsUtil->supportsExtension("GL_KHR_texture_compression_astc_ldr");
+}
+
+const char* WebGLCompressedTextureASTC::extensionName()
+{
+    return "WEBGL_compressed_texture_astc_ldr";

[Ken Russell (switch to Gerrit), 2015/08/18 00:05:02]

At this point this should be "WEBGL_compressed_texture_astc".

+}
+
+} // namespace blink