Upgrade WebGLImageConversion to ES3: Part I.

Source/platform/graphics/gpu/WebGLImageConversion.cpp

 // Copyright 2014 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 "platform/graphics/gpu/WebGLImageConversion.h"
 
 #include "platform/CheckedInt.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/cpu/arm/WebGLImageConversionNEON.h"
@@ skipping 194 matching lines @@
         break;
     case GL_UNSIGNED_SHORT_4_4_4_4:
         dstFormat = WebGLImageConversion::DataFormatRGBA4444;
         break;
     case GL_UNSIGNED_SHORT_5_5_5_1:
         dstFormat = WebGLImageConversion::DataFormatRGBA5551;
         break;
     case GL_UNSIGNED_SHORT_5_6_5:
         dstFormat = WebGLImageConversion::DataFormatRGB565;
         break;
+    case GL_UNSIGNED_INT_5_9_9_9_REV:
+        dstFormat = WebGLImageConversion::DataFormatRGB5999;
+        break;
     case GL_UNSIGNED_INT_24_8:
         dstFormat = WebGLImageConversion::DataFormatDS24_8;
         break;
     case GL_UNSIGNED_INT_10F_11F_11F_REV:
         dstFormat = WebGLImageConversion::DataFormatRGB10F11F11F;
         break;
     case GL_UNSIGNED_INT_2_10_10_10_REV:
         dstFormat = WebGLImageConversion::DataFormatRGBA2_10_10_10;
         break;
     default:
@@ skipping 905 matching lines @@
         || format == WebGLImageConversion::DataFormatAR8
         || format == WebGLImageConversion::DataFormatRA16F
         || format == WebGLImageConversion::DataFormatRA32F
         || format == WebGLImageConversion::DataFormatRGBA8
         || format == WebGLImageConversion::DataFormatBGRA8
         || format == WebGLImageConversion::DataFormatARGB8
         || format == WebGLImageConversion::DataFormatABGR8
         || format == WebGLImageConversion::DataFormatRGBA16F
         || format == WebGLImageConversion::DataFormatRGBA32F
         || format == WebGLImageConversion::DataFormatRGBA4444
-        || format == WebGLImageConversion::DataFormatRGBA5551;
+        || format == WebGLImageConversion::DataFormatRGBA5551
+        || format == WebGLImageConversion::DataFormatRGBA8_S
+        || format == WebGLImageConversion::DataFormatRGBA16
+        || format == WebGLImageConversion::DataFormatRGBA16_S
+        || format == WebGLImageConversion::DataFormatRGBA32
+        || format == WebGLImageConversion::DataFormatRGBA32_S
+        || format == WebGLImageConversion::DataFormatRGBA2_10_10_10;
 }
 
 bool HasColor(int format)
 {
     return format == WebGLImageConversion::DataFormatRGBA8
         || format == WebGLImageConversion::DataFormatRGBA16F
         || format == WebGLImageConversion::DataFormatRGBA32F
         || format == WebGLImageConversion::DataFormatRGB8
         || format == WebGLImageConversion::DataFormatRGB16F
         || format == WebGLImageConversion::DataFormatRGB32F
         || format == WebGLImageConversion::DataFormatBGR8
         || format == WebGLImageConversion::DataFormatBGRA8
         || format == WebGLImageConversion::DataFormatARGB8
         || format == WebGLImageConversion::DataFormatABGR8
         || format == WebGLImageConversion::DataFormatRGBA5551
         || format == WebGLImageConversion::DataFormatRGBA4444
         || format == WebGLImageConversion::DataFormatRGB565
         || format == WebGLImageConversion::DataFormatR8
         || format == WebGLImageConversion::DataFormatR16F
         || format == WebGLImageConversion::DataFormatR32F
         || format == WebGLImageConversion::DataFormatRA8
         || format == WebGLImageConversion::DataFormatRA16F
         || format == WebGLImageConversion::DataFormatRA32F
-        || format == WebGLImageConversion::DataFormatAR8;
+        || format == WebGLImageConversion::DataFormatAR8
+        || format == WebGLImageConversion::DataFormatRGBA8_S
+        || format == WebGLImageConversion::DataFormatRGBA16
+        || format == WebGLImageConversion::DataFormatRGBA16_S
+        || format == WebGLImageConversion::DataFormatRGBA32
+        || format == WebGLImageConversion::DataFormatRGBA32_S
+        || format == WebGLImageConversion::DataFormatRGBA2_10_10_10
+        || format == WebGLImageConversion::DataFormatRGB8_S
+        || format == WebGLImageConversion::DataFormatRGB16
+        || format == WebGLImageConversion::DataFormatRGB16_S
+        || format == WebGLImageConversion::DataFormatRGB32
+        || format == WebGLImageConversion::DataFormatRGB32_S
+        || format == WebGLImageConversion::DataFormatRGB10F11F11F
+        || format == WebGLImageConversion::DataFormatRGB5999
+        || format == WebGLImageConversion::DataFormatRG8
+        || format == WebGLImageConversion::DataFormatRG8_S
+        || format == WebGLImageConversion::DataFormatRG16
+        || format == WebGLImageConversion::DataFormatRG16_S
+        || format == WebGLImageConversion::DataFormatRG32
+        || format == WebGLImageConversion::DataFormatRG32_S
+        || format == WebGLImageConversion::DataFormatRG16F
+        || format == WebGLImageConversion::DataFormatRG32F
+        || format == WebGLImageConversion::DataFormatR8_S
+        || format == WebGLImageConversion::DataFormatR16
+        || format == WebGLImageConversion::DataFormatR16_S
+        || format == WebGLImageConversion::DataFormatR32
+        || format == WebGLImageConversion::DataFormatR32_S;
 }
 
 template<int Format>
+struct IsInt8Format {
+    static const bool Value =
+        Format == WebGLImageConversion::DataFormatRGBA8_S
+        || Format == WebGLImageConversion::DataFormatRGB8_S
+        || Format == WebGLImageConversion::DataFormatRG8_S
+        || Format == WebGLImageConversion::DataFormatR8_S;
+};
+
+template<int Format>
+struct IsInt16Format {
+    static const bool Value =
+        Format == WebGLImageConversion::DataFormatRGBA16_S
+        || Format == WebGLImageConversion::DataFormatRGB16_S
+        || Format == WebGLImageConversion::DataFormatRG16_S
+        || Format == WebGLImageConversion::DataFormatR16_S;
+};
+
+template<int Format>
+struct IsInt32Format {
+    static const bool Value =
+        Format == WebGLImageConversion::DataFormatRGBA32_S
+        || Format == WebGLImageConversion::DataFormatRGB32_S
+        || Format == WebGLImageConversion::DataFormatRG32_S
+        || Format == WebGLImageConversion::DataFormatR32_S;
+};
+
+template<int Format>
+struct IsUInt8Format {
+    static const bool Value =
+        Format == WebGLImageConversion::DataFormatRGBA8
+        || Format == WebGLImageConversion::DataFormatRGB8
+        || Format == WebGLImageConversion::DataFormatRG8
+        || Format == WebGLImageConversion::DataFormatR8
+        || Format == WebGLImageConversion::DataFormatBGRA8
+        || Format == WebGLImageConversion::DataFormatBGR8
+        || Format == WebGLImageConversion::DataFormatARGB8
+        || Format == WebGLImageConversion::DataFormatABGR8
+        || Format == WebGLImageConversion::DataFormatRA8
+        || Format == WebGLImageConversion::DataFormatAR8
+        || Format == WebGLImageConversion::DataFormatA8;
+};
+
+template<int Format>
+struct IsUInt16Format {
+    static const bool Value =
+        Format == WebGLImageConversion::DataFormatRGBA16
+        || Format == WebGLImageConversion::DataFormatRGB16
+        || Format == WebGLImageConversion::DataFormatRG16
+        || Format == WebGLImageConversion::DataFormatR16;
+};
+
+template<int Format>
+struct IsUInt32Format {
+    static const bool Value =
+        Format == WebGLImageConversion::DataFormatRGBA32
+        || Format == WebGLImageConversion::DataFormatRGB32
+        || Format == WebGLImageConversion::DataFormatRG32
+        || Format == WebGLImageConversion::DataFormatR32;
+};
+
+template<int Format>
 struct IsFloatFormat {
     static const bool Value =
         Format == WebGLImageConversion::DataFormatRGBA32F
         || Format == WebGLImageConversion::DataFormatRGB32F
         || Format == WebGLImageConversion::DataFormatRA32F
         || Format == WebGLImageConversion::DataFormatR32F
-        || Format == WebGLImageConversion::DataFormatA32F;
+        || Format == WebGLImageConversion::DataFormatA32F
+        || Format == WebGLImageConversion::DataFormatRG32F;
 };
 
 template<int Format>
 struct IsHalfFloatFormat {
     static const bool Value =
         Format == WebGLImageConversion::DataFormatRGBA16F
         || Format == WebGLImageConversion::DataFormatRGB16F
         || Format == WebGLImageConversion::DataFormatRA16F
         || Format == WebGLImageConversion::DataFormatR16F
-        || Format == WebGLImageConversion::DataFormatA16F;
+        || Format == WebGLImageConversion::DataFormatA16F
+        || Format == WebGLImageConversion::DataFormatRG16F;
 };
 
 template<int Format>
+struct Is32bppFormat {
+    static const bool Value =
+        Format == WebGLImageConversion::DataFormatRGBA2_10_10_10
+        || Format == WebGLImageConversion::DataFormatRGB5999
+        || Format == WebGLImageConversion::DataFormatRGB10F11F11F;
+};
+
+template<int Format>
 struct Is16bppFormat {
     static const bool Value =
         Format == WebGLImageConversion::DataFormatRGBA5551
         || Format == WebGLImageConversion::DataFormatRGBA4444
         || Format == WebGLImageConversion::DataFormatRGB565;
 };
 
-template<int Format, bool IsFloat = IsFloatFormat<Format>::Value, bool IsHalfFloat = IsHalfFloatFormat<Format>::Value, bool Is16bpp = Is16bppFormat<Format>::Value>
+template<int Format,
+    bool IsInt8Format = IsInt8Format<Format>::Value,
+    bool IsUInt8Format = IsUInt8Format<Format>::Value,
+    bool IsInt16Format = IsInt16Format<Format>::Value,
+    bool IsUInt16Format = IsUInt16Format<Format>::Value,
+    bool IsInt32Format = IsInt32Format<Format>::Value,
+    bool IsUInt32Format = IsUInt32Format<Format>::Value,
+    bool IsFloat = IsFloatFormat<Format>::Value,
+    bool IsHalfFloat = IsHalfFloatFormat<Format>::Value,
+    bool Is16bpp = Is16bppFormat<Format>::Value,
+    bool Is32bpp = Is32bppFormat<Format>::Value>
 struct DataTypeForFormat {
+    typedef double Type; // Use a type that's not used in unpack/pack.
+};
+
+template<int Format>
+struct DataTypeForFormat<Format, true, false, false, false, false, false, false, false, false, false> {
+    typedef int8_t Type;
+};
+
+template<int Format>
+struct DataTypeForFormat<Format, false, true, false, false, false, false, false, false, false, false> {
     typedef uint8_t Type;
 };
 
 template<int Format>
-struct DataTypeForFormat<Format, true, false, false> {
+struct DataTypeForFormat<Format, false, false, true, false, false, false, false, false, false, false> {
+    typedef int16_t Type;
+};
+
+template<int Format>
+struct DataTypeForFormat<Format, false, false, false, true, false, false, false, false, false, false> {
+    typedef uint16_t Type;
+};
+
+template<int Format>
+struct DataTypeForFormat<Format, false, false, false, false, true, false, false, false, false, false> {
+    typedef int32_t Type;
+};
+
+template<int Format>
+struct DataTypeForFormat<Format, false, false, false, false, false, true, false, false, false, false> {
+    typedef uint32_t Type;
+};
+
+template<int Format>
+struct DataTypeForFormat<Format, false, false, false, false, false, false, true, false, false, false> {
     typedef float Type;
 };
 
 template<int Format>
-struct DataTypeForFormat<Format, false, true, false> {
+struct DataTypeForFormat<Format, false, false, false, false, false, false, false, true, false, false> {
     typedef uint16_t Type;
 };
 
 template<int Format>
-struct DataTypeForFormat<Format, false, false, true> {
+struct DataTypeForFormat<Format, false, false, false, false, false, false, false, false, true, false> {
     typedef uint16_t Type;
 };
 
 template<int Format>
+struct DataTypeForFormat<Format, false, false, false, false, false, false, false, false, false, true> {
+    typedef uint32_t Type;
+};
+
+template<int Format>
+struct UsesFloatIntermediateFormat {
+    static const bool Value =
+        IsFloatFormat<Format>::Value
+        || IsHalfFloatFormat<Format>::Value
+        || Format == WebGLImageConversion::DataFormatRGB10F11F11F
+        || Format == WebGLImageConversion::DataFormatRGB5999;
+};
+
+template<int Format>
 struct IntermediateFormat {
-    static const int Value = (IsFloatFormat<Format>::Value || IsHalfFloatFormat<Format>::Value) ? WebGLImageConversion::DataFormatRGBA32F : WebGLImageConversion::DataFormatRGBA8;
+    static const int Value =
+        UsesFloatIntermediateFormat<Format>::Value ? WebGLImageConversion::DataFormatRGBA32F
+        : IsInt32Format<Format>::Value ? WebGLImageConversion::DataFormatRGBA32_S
+        : IsUInt32Format<Format>::Value ? WebGLImageConversion::DataFormatRGBA32
+        : IsInt16Format<Format>::Value ? WebGLImageConversion::DataFormatRGBA16_S
+        : (IsUInt16Format<Format>::Value || Is32bppFormat<Format>::Value) ? WebGLImageConversion::DataFormatRGBA16
+        : IsInt8Format<Format>::Value ? WebGLImageConversion::DataFormatRGBA8_S : WebGLImageConversion::DataFormatRGBA8;
 };
 
 unsigned TexelBytesForFormat(WebGLImageConversion::DataFormat format)
 {
     switch (format) {
     case WebGLImageConversion::DataFormatR8:
     case WebGLImageConversion::DataFormatR8_S:
     case WebGLImageConversion::DataFormatA8:
         return 1;
     case WebGLImageConversion::DataFormatRG8:
@@ skipping 190 matching lines @@
         ASSERT_NOT_REACHED();
         return;
     }
     if ((!HasAlpha(SrcFormat) || !HasColor(SrcFormat) || !HasColor(DstFormat)) && alphaOp != WebGLImageConversion::AlphaDoNothing) {
         ASSERT_NOT_REACHED();
         return;
     }
 
     typedef typename DataTypeForFormat<SrcFormat>::Type SrcType;
     typedef typename DataTypeForFormat<DstFormat>::Type DstType;
-    const int IntermediateSrcFormat = IntermediateFormat<DstFormat>::Value;
-    typedef typename DataTypeForFormat<IntermediateSrcFormat>::Type IntermediateSrcType;
+    const int IntermFormat = IntermediateFormat<DstFormat>::Value;
+    typedef typename DataTypeForFormat<IntermFormat>::Type IntermType;
     const ptrdiff_t srcStrideInElements = m_srcStride / sizeof(SrcType);
     const ptrdiff_t dstStrideInElements = m_dstStride / sizeof(DstType);
-    const bool trivialUnpack = (SrcFormat == WebGLImageConversion::DataFormatRGBA8 && !IsFloatFormat<DstFormat>::Value && !IsHalfFloatFormat<DstFormat>::Value) || SrcFormat == WebGLImageConversion::DataFormatRGBA32F;
-    const bool trivialPack = (DstFormat == WebGLImageConversion::DataFormatRGBA8 || DstFormat == WebGLImageConversion::DataFormatRGBA32F) && alphaOp == WebGLImageConversion::AlphaDoNothing && m_dstStride > 0;
+    const bool trivialUnpack = SrcFormat == IntermFormat;
+    const bool trivialPack = DstFormat == IntermFormat && alphaOp == WebGLImageConversion::AlphaDoNothing && m_dstStride > 0;
     ASSERT(!trivialUnpack || !trivialPack);
 
     const SrcType *srcRowStart = static_cast<const SrcType*>(m_srcStart);
     DstType* dstRowStart = static_cast<DstType*>(m_dstStart);
     if (trivialUnpack) {
         for (size_t i = 0; i < m_height; ++i) {
             pack<DstFormat, alphaOp>(srcRowStart, dstRowStart, m_width);
             srcRowStart += srcStrideInElements;
             dstRowStart += dstStrideInElements;
         }
     } else if (trivialPack) {
         for (size_t i = 0; i < m_height; ++i) {
             unpack<SrcFormat>(srcRowStart, dstRowStart, m_width);
             srcRowStart += srcStrideInElements;
             dstRowStart += dstStrideInElements;
         }
     } else {
         for (size_t i = 0; i < m_height; ++i) {
-            unpack<SrcFormat>(srcRowStart, reinterpret_cast<IntermediateSrcType*>(m_unpackedIntermediateSrcData.get()), m_width);
-            pack<DstFormat, alphaOp>(reinterpret_cast<IntermediateSrcType*>(m_unpackedIntermediateSrcData.get()), dstRowStart, m_width);
+            unpack<SrcFormat>(srcRowStart, reinterpret_cast<IntermType*>(m_unpackedIntermediateSrcData.get()), m_width);
+            pack<DstFormat, alphaOp>(reinterpret_cast<IntermType*>(m_unpackedIntermediateSrcData.get()), dstRowStart, m_width);
             srcRowStart += srcStrideInElements;
             dstRowStart += dstStrideInElements;
         }
     }
     m_success = true;
     return;
 }
 
 } // anonymous namespace
 
@@ skipping 388 matching lines @@
     }
 
     FormatConverter converter(width, height, sourceData, destinationData, srcStride, dstStride);
     converter.convert(sourceDataFormat, dstDataFormat, alphaOp);
     if (!converter.Success())
         return false;
     return true;
 }
 
 } // namespace blink