Fix TexStorage3D with compressed ETC2/EAC formats

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

 // 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/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 88 matching lines @@
     GL_COMPRESSED_RG11_EAC,
     GL_COMPRESSED_SIGNED_RG11_EAC,
     GL_COMPRESSED_RGB8_ETC2,
     GL_COMPRESSED_SRGB8_ETC2,
     GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,
     GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
     GL_COMPRESSED_RGBA8_ETC2_EAC,
     GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,
 };
 
+const GLenum kCompressedTextureFormatsETC2EAC[] = {
+    GL_COMPRESSED_R11_EAC,
+    GL_COMPRESSED_SIGNED_R11_EAC,
+    GL_COMPRESSED_RG11_EAC,
+    GL_COMPRESSED_SIGNED_RG11_EAC,
+    GL_COMPRESSED_RGB8_ETC2,
+    GL_COMPRESSED_SRGB8_ETC2,
+    GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,
+    GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
+    GL_COMPRESSED_RGBA8_ETC2_EAC,
+    GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC,
+};
+
 WebGL2RenderingContextBase::WebGL2RenderingContextBase(HTMLCanvasElement* passedCanvas, PassOwnPtr<WebGraphicsContext3D> context, const WebGLContextAttributes& requestedAttributes)
     : WebGLRenderingContextBase(passedCanvas, context, requestedAttributes)
 {
     m_supportedInternalFormatsStorage.insert(kSupportedInternalFormatsStorage, kSupportedInternalFormatsStorage + arraysize(kSupportedInternalFormatsStorage));
+    m_compressedTextureFormatsETC2EAC.insert(kCompressedTextureFormatsETC2EAC, kCompressedTextureFormatsETC2EAC + arraysize(kCompressedTextureFormatsETC2EAC));
 }
 
 WebGL2RenderingContextBase::~WebGL2RenderingContextBase()
 {
     m_readFramebufferBinding = nullptr;
 
     m_boundCopyReadBuffer = nullptr;
     m_boundCopyWriteBuffer = nullptr;
     m_boundPixelPackBuffer = nullptr;
     m_boundPixelUnpackBuffer = nullptr;
@@ skipping 455 matching lines @@
         if (target != GL_TEXTURE_3D && target != GL_TEXTURE_2D_ARRAY) {
             synthesizeGLError(GL_INVALID_ENUM, functionName, "invalid 3D target");
             return false;
         }
     }
 
     WebGLTexture* tex = validateTextureBinding(functionName, target, false);
     if (!tex)
         return false;
 
+    if (functionType == TexStorageType3D && target == GL_TEXTURE_3D && m_compressedTextureFormatsETC2EAC.find(internalformat) != m_compressedTextureFormatsETC2EAC.end()) {
+        synthesizeGLError(GL_INVALID_OPERATION, functionName, "invalid ETC2/EAC internalformat for TexStorage3D if target is not TEXTURE_2D_ARRAY");
+        return false;
+    }

[bajones, 2015/11/19 19:16:21]

A couple of really minor nits here: Could you change the logic to read "&&
target != GL_TEXTURE_2D_ARRAY" instead of "&& target == GL_TEXTURE_3D"? I know
it's functionally equivalent, but it states the purpose of the validation more
explicitly. I had to re-read the statement a couple of times to make sure I knew
what it was testing.

Also, the error string reads strangely to me. I'd suggest simply "target for
ETC2/EAC internal formats must be TEXTURE_2D_ARRAY", and the browser should
provide context for the function which produced the error.

[qiankun, 2015/11/19 22:54:08]

Done.

+
     if (m_supportedInternalFormatsStorage.find(internalformat) == m_supportedInternalFormatsStorage.end()) {
         synthesizeGLError(GL_INVALID_ENUM, functionName, "invalid internalformat");
         return false;
     }
 
     if (tex->isImmutable()) {
         synthesizeGLError(GL_INVALID_OPERATION, functionName, "attempted to modify immutable texture");
         return false;
     }
 
@@ skipping 2480 matching lines @@
 GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat()
 {
     if (m_readFramebufferBinding && m_readFramebufferBinding->object())
         return m_readFramebufferBinding->colorBufferFormat();
     if (m_requestedAttributes.alpha())
         return GL_RGBA;
     return GL_RGB;
 }
 
 } // namespace blink