Implement WEBGL_compressed_texture_s3tc_srgb

third_party/WebKit/Source/modules/webgl/WebGLCompressedTextureS3TCsRGB.cpp

 /*
- * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2016 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "modules/webgl/WebGLCompressedTextureS3TC.h"
+#include "modules/webgl/WebGLCompressedTextureS3TCsRGB.h"
 
 #include "modules/webgl/WebGLRenderingContextBase.h"
 
 namespace blink {
 
-WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC(WebGLRenderingContextBase* context)
+WebGLCompressedTextureS3TCsRGB::WebGLCompressedTextureS3TCsRGB(WebGLRenderingContextBase* context)
     : WebGLExtension(context)
 {
-    context->addCompressedTextureFormat(GL_COMPRESSED_RGB_S3TC_DXT1_EXT);
-    context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT);
-    context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT);
-    context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
+    context->addCompressedTextureFormat(GL_COMPRESSED_SRGB_S3TC_DXT1_NV);
+    context->addCompressedTextureFormat(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV);
+    context->addCompressedTextureFormat(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV);
+    context->addCompressedTextureFormat(GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV);

[Kai Ninomiya, 2016/09/15 21:54:08]

Should these be left as _NV, or should we define the _EXT versions somewhere?
The values are of course the same.

[Ken Russell (switch to Gerrit), 2016/09/15 23:38:26]

We'd need to modify src/third_party/khronos/GLES2/gl2ext.h to use the _EXT
versions -- probably best to wait until GL_EXT_compressed_texture_s3tc_srgb is
ratified by Khronos, and just rev our copy of the Khronos headers at that point.

I suggest adding a comment:
// TODO(kainino): update these with _EXT versions once
GL_EXT_compressed_texture_s3tc_srgb is ratified

 }
 
-WebGLCompressedTextureS3TC::~WebGLCompressedTextureS3TC()
+WebGLCompressedTextureS3TCsRGB::~WebGLCompressedTextureS3TCsRGB()
 {
 }
 
-WebGLExtensionName WebGLCompressedTextureS3TC::name() const
+WebGLExtensionName WebGLCompressedTextureS3TCsRGB::name() const
 {
-    return WebGLCompressedTextureS3TCName;
+    return WebGLCompressedTextureS3TCsRGBName;
 }
 
-WebGLCompressedTextureS3TC* WebGLCompressedTextureS3TC::create(WebGLRenderingContextBase* context)
+WebGLCompressedTextureS3TCsRGB* WebGLCompressedTextureS3TCsRGB::create(WebGLRenderingContextBase* context)
 {
-    return new WebGLCompressedTextureS3TC(context);
+    return new WebGLCompressedTextureS3TCsRGB(context);
 }
 
-bool WebGLCompressedTextureS3TC::supported(WebGLRenderingContextBase* context)
+bool WebGLCompressedTextureS3TCsRGB::supported(WebGLRenderingContextBase* context)
 {
     Extensions3DUtil* extensionsUtil = context->extensionsUtil();
-    return extensionsUtil->supportsExtension("GL_EXT_texture_compression_s3tc")
-        || (extensionsUtil->supportsExtension("GL_EXT_texture_compression_dxt1")
-            && extensionsUtil->supportsExtension("GL_CHROMIUM_texture_compression_dxt3")
-            && extensionsUtil->supportsExtension("GL_CHROMIUM_texture_compression_dxt5"));
+    return extensionsUtil->supportsExtension("GL_EXT_texture_compression_s3tc_srgb");
 }
 
-const char* WebGLCompressedTextureS3TC::extensionName()
+const char* WebGLCompressedTextureS3TCsRGB::extensionName()
 {
-    return "WEBGL_compressed_texture_s3tc";
+    return "WEBGL_compressed_texture_s3tc_srgb";
 }
 
 } // namespace blink