Validate internalformat/format/type for uploading DOM elements to texture

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

 /*
  * Copyright (C) 2009 Apple 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
@@ skipping 756 matching lines @@
     GL_RGBA8_SNORM,
     GL_RGBA16F,
     GL_RGBA32F,
     GL_DEPTH_COMPONENT16,
     GL_DEPTH_COMPONENT24,
     GL_DEPTH_COMPONENT32F,
     GL_DEPTH24_STENCIL8,
     GL_DEPTH32F_STENCIL8,
 };
 
+// ES3 enums supported by TexImageSource
+static const GLenum kSupportedInternalFormatsTexImageSourceES3[] = {
+    GL_R8,
+    GL_R16F,
+    GL_R32F,
+    GL_R8UI,
+    GL_RG8,
+    GL_RG16F,
+    GL_RG32F,
+    GL_RG8UI,
+    GL_RGB8,
+    GL_SRGB8,
+    GL_RGB565,
+    GL_R11F_G11F_B10F,
+    GL_RGB9_E5,
+    GL_RGB16F,
+    GL_RGB32F,
+    GL_RGB8UI,
+    GL_RGBA8,
+    GL_SRGB8_ALPHA8,
+    GL_RGB5_A1,
+    GL_RGBA4,
+    GL_RGBA16F,
+    GL_RGBA32F,
+    GL_RGBA8UI,
+};
+
 // ES2 enums
 static const GLenum kSupportedFormatsES2[] = {
     GL_RGB,
     GL_RGBA,
     GL_LUMINANCE_ALPHA,
     GL_LUMINANCE,
     GL_ALPHA,
 };
 
 // Exposed by GL_ANGLE_depth_texture
@@ skipping 15 matching lines @@
     GL_RG,
     GL_RG_INTEGER,
     GL_RGB,
     GL_RGB_INTEGER,
     GL_RGBA,
     GL_RGBA_INTEGER,
     GL_DEPTH_COMPONENT,
     GL_DEPTH_STENCIL,
 };
 
+// ES3 enums supported by TexImageSource
+static const GLenum kSupportedFormatsTexImageSourceES3[] = {
+    GL_RED,
+    GL_RED_INTEGER,
+    GL_RG,
+    GL_RG_INTEGER,
+    GL_RGB,
+    GL_RGB_INTEGER,
+    GL_RGBA,
+    GL_RGBA_INTEGER,
+};
+
 // ES2 enums
 static const GLenum kSupportedTypesES2[] = {
     GL_UNSIGNED_BYTE,
     GL_UNSIGNED_SHORT_5_6_5,
     GL_UNSIGNED_SHORT_4_4_4_4,
     GL_UNSIGNED_SHORT_5_5_5_1,
 };
 
 // Exposed by GL_OES_texture_float
 static const GLenum kSupportedTypesOESTexFloat[] = {
@@ skipping 21 matching lines @@
     GL_INT,
     GL_HALF_FLOAT,
     GL_FLOAT,
     GL_UNSIGNED_INT_2_10_10_10_REV,
     GL_UNSIGNED_INT_10F_11F_11F_REV,
     GL_UNSIGNED_INT_5_9_9_9_REV,
     GL_UNSIGNED_INT_24_8,
     GL_FLOAT_32_UNSIGNED_INT_24_8_REV,
 };
 
+// ES3 enums supported by TexImageSource
+static const GLenum kSupportedTypesTexImageSourceES3[] = {
+    GL_UNSIGNED_SHORT,
+    GL_SHORT,
+    GL_UNSIGNED_INT,
+    GL_INT,
+    GL_HALF_FLOAT,
+    GL_FLOAT,
+    GL_UNSIGNED_INT_10F_11F_11F_REV,
+};
+
 bool isUnsignedIntegerFormat(GLenum internalformat)
 {
     switch (internalformat) {
     case GL_R8UI:
     case GL_R16UI:
     case GL_R32UI:
     case GL_RG8UI:
     case GL_RG16UI:
     case GL_RG32UI:
     case GL_RGB8UI:
@@ skipping 3160 matching lines @@
         contextGL()->TexSubImage3D(target, level, xoffset, yoffset, zoffset, imageExtractor.imageWidth(), imageExtractor.imageHeight(), 1, format, type, needConversion ? data.data() : imagePixelData);
     }
     restoreUnpackParameters();
 }
 
 bool WebGLRenderingContextBase::validateTexFunc(const char* functionName, TexImageFunctionType functionType, TexFuncValidationSourceType sourceType, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLint xoffset, GLint yoffset, GLint zoffset)
 {
     if (!validateTexFuncLevel(functionName, target, level))
         return false;
 
-    if (!validateTexFuncParameters(functionName, functionType, target, level, internalformat, width, height, depth, border, format, type))
+    if (!validateTexFuncParameters(functionName, functionType, sourceType, target, level, internalformat, width, height, depth, border, format, type))
         return false;
 
     if (functionType == TexSubImage) {
         if (!validateSettableTexFormat(functionName, format))
             return false;
         if (!validateSize(functionName, xoffset, yoffset, zoffset))
             return false;
     } else {
         // For SourceArrayBufferView, function validateTexFuncData() would handle whether to validate the SettableTexFormat
         // by checking if the ArrayBufferView is null or not.
@@ skipping 1475 matching lines @@
             continue;
         }
         if (!validateCharacter(string[i])) {
             synthesizeGLError(GL_INVALID_VALUE, "shaderSource", "string not ASCII");
             return false;
         }
     }
     return true;
 }
 
-bool WebGLRenderingContextBase::validateTexFuncFormatAndType(const char* functionName, TexImageFunctionType functionType, GLenum internalformat, GLenum format, GLenum type, GLint level)
+bool WebGLRenderingContextBase::validateTexFuncFormatAndType(const char* functionName, TexImageFunctionType functionType, TexFuncValidationSourceType sourceType, GLenum internalformat, GLenum format, GLenum type, GLint level)
 {
     if (!m_isWebGL2FormatsTypesAdded && isWebGL2OrHigher()) {
-        ADD_VALUES_TO_SET(m_supportedInternalFormats, kSupportedInternalFormatsES3);
-        ADD_VALUES_TO_SET(m_supportedInternalFormats, kSupportedInternalFormatsTexImageES3);
-        ADD_VALUES_TO_SET(m_supportedFormats, kSupportedFormatsES3);
-        ADD_VALUES_TO_SET(m_supportedTypes, kSupportedTypesES3);
+        if (sourceType == SourceHTMLImageElement || sourceType == SourceHTMLCanvasElement || sourceType == SourceHTMLVideoElement) {

[qiankun, 2016/09/26 14:34:11]

I am not sure should SourceImageData and SourceImageBitmap apply the same rule.
What's your opinion?

[Ken Russell (switch to Gerrit), 2016/09/26 22:19:43]

Yes, the same rules apply to all of the types in the TexImageSource union type.
I just clarified this in https://github.com/KhronosGroup/WebGL/pull/2063 .

Even if different rules applied, the code change below would not be correct.
This would make it so that the first call to validateTexFuncFormatAndType would
add one set of enums or the other to the various validators, making them wrong
for the other kinds of uploads for the lifetime of the context. Either more
validators would be needed, or some other solution would need to be found.

[qiankun, 2016/09/27 10:22:25]

I added another function
WebGLRenderingContextBase::validateTexImageSourceFormatAndType to do format and
type validation for TexImage taking TexImageSource data source. It's clearer
than adding related validations in
WebGLRenderingContextBase::validateTexFuncFormatAndType. 

A conformance test is added to validate TexImage with different data source:
https://github.com/KhronosGroup/WebGL/pull/2064.

I am also preparing other conformance tests to verify invalid
internalformat/format/type for canvas/video/image/image_data/.

+            ADD_VALUES_TO_SET(m_supportedInternalFormats, kSupportedInternalFormatsTexImageSourceES3);
+            ADD_VALUES_TO_SET(m_supportedFormats, kSupportedFormatsTexImageSourceES3);
+            ADD_VALUES_TO_SET(m_supportedTypes, kSupportedTypesTexImageSourceES3);
+        } else {
+            ADD_VALUES_TO_SET(m_supportedInternalFormats, kSupportedInternalFormatsES3);
+            ADD_VALUES_TO_SET(m_supportedInternalFormats, kSupportedInternalFormatsTexImageES3);
+            ADD_VALUES_TO_SET(m_supportedFormats, kSupportedFormatsES3);
+            ADD_VALUES_TO_SET(m_supportedTypes, kSupportedTypesES3);
+        }
         m_isWebGL2FormatsTypesAdded = true;
     }
 
     if (!isWebGL2OrHigher()) {
         if (!m_isOESTextureFloatFormatsTypesAdded && extensionEnabled(OESTextureFloatName)) {
             ADD_VALUES_TO_SET(m_supportedTypes, kSupportedTypesOESTexFloat);
             m_isOESTextureFloatFormatsTypesAdded = true;
         }
 
         if (!m_isOESTextureHalfFloatFormatsTypesAdded && extensionEnabled(OESTextureHalfFloatName)) {
@@ skipping 125 matching lines @@
             }
             break;
         }
     default:
         synthesizeGLError(GL_INVALID_ENUM, functionName, "invalid target");
         return false;
     }
     return true;
 }
 
-bool WebGLRenderingContextBase::validateTexFuncParameters(const char* functionName, TexImageFunctionType functionType, GLenum target,
+bool WebGLRenderingContextBase::validateTexFuncParameters(const char* functionName, TexImageFunctionType functionType, TexFuncValidationSourceType sourceType, GLenum target,
     GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type)
 {
     // We absolutely have to validate the format and type combination.
     // The texImage2D entry points taking HTMLImage, etc. will produce
     // temporary data based on this combination, so it must be legal.
-    if (!validateTexFuncFormatAndType(functionName, functionType, internalformat, format, type, level))
+    if (!validateTexFuncFormatAndType(functionName, functionType, sourceType, internalformat, format, type, level))
         return false;
 
     if (!validateTexFuncDimensions(functionName, functionType, target, level, width, height, depth))
         return false;
 
     if (border) {
         synthesizeGLError(GL_INVALID_VALUE, functionName, "border != 0");
         return false;
     }
 
@@ skipping 775 matching lines @@
 
 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas(HTMLCanvasElementOrOffscreenCanvas& result) const
 {
     if (canvas())
         result.setHTMLCanvasElement(canvas());
     else
         result.setOffscreenCanvas(getOffscreenCanvas());
 }
 
 } // namespace blink