Remove unnecessary image packing code.

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 346 matching lines @@
 // Some code are merged back from Mozilla code in http://mxr.mozilla.org/mozilla-central/source/content/canvas/src/WebGLTexelConversions.h
 
 //----------------------------------------------------------------------
 // Pixel unpacking routines.
 template<int format, typename SourceType, typename DstType>
 void unpack(const SourceType*, DstType*, unsigned)
 {
     ASSERT_NOT_REACHED();
 }
 
-template<> void unpack<WebGLImageConversion::DataFormatRGB8, uint8_t, uint8_t>(const uint8_t* source, uint8_t* destination, unsigned pixelsPerRow)
-{
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = source[0];
-        destination[1] = source[1];
-        destination[2] = source[2];
-        destination[3] = 0xFF;
-        source += 3;
-        destination += 4;
-    }
-}
-
-template<> void unpack<WebGLImageConversion::DataFormatBGR8, uint8_t, uint8_t>(const uint8_t* source, uint8_t* destination, unsigned pixelsPerRow)
-{
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = source[2];
-        destination[1] = source[1];
-        destination[2] = source[0];
-        destination[3] = 0xFF;
-        source += 3;
-        destination += 4;
-    }
-}
-
 template<> void unpack<WebGLImageConversion::DataFormatARGB8, uint8_t, uint8_t>(const uint8_t* source, uint8_t* destination, unsigned pixelsPerRow)
 {
     for (unsigned i = 0; i < pixelsPerRow; ++i) {
         destination[0] = source[1];
         destination[1] = source[2];
         destination[2] = source[3];
         destination[3] = source[0];
         source += 4;
         destination += 4;
     }
@@ skipping 61 matching lines @@
         uint8_t a = packedValue & 0x0F;
         destination[0] = r << 4 | r;
         destination[1] = g << 4 | g;
         destination[2] = b << 4 | b;
         destination[3] = a << 4 | a;
         source += 1;
         destination += 4;
     }
 }
 
-template<> void unpack<WebGLImageConversion::DataFormatRGB565, uint16_t, uint8_t>(const uint16_t* source, uint8_t* destination, unsigned pixelsPerRow)
-{
-#if HAVE(ARM_NEON_INTRINSICS)
-    SIMD::unpackOneRowOfRGB565ToRGBA8(source, destination, pixelsPerRow);
-#endif
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        uint16_t packedValue = source[0];
-        uint8_t r = packedValue >> 11;
-        uint8_t g = (packedValue >> 5) & 0x3F;
-        uint8_t b = packedValue & 0x1F;
-        destination[0] = (r << 3) | (r & 0x7);
-        destination[1] = (g << 2) | (g & 0x3);
-        destination[2] = (b << 3) | (b & 0x7);
-        destination[3] = 0xFF;
-        source += 1;
-        destination += 4;
-    }
-}
-
-template<> void unpack<WebGLImageConversion::DataFormatR8, uint8_t, uint8_t>(const uint8_t* source, uint8_t* destination, unsigned pixelsPerRow)
-{
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = source[0];
-        destination[1] = source[0];
-        destination[2] = source[0];
-        destination[3] = 0xFF;
-        source += 1;
-        destination += 4;
-    }
-}
-
 template<> void unpack<WebGLImageConversion::DataFormatRA8, uint8_t, uint8_t>(const uint8_t* source, uint8_t* destination, unsigned pixelsPerRow)
 {
     for (unsigned i = 0; i < pixelsPerRow; ++i) {
         destination[0] = source[0];
         destination[1] = source[0];
         destination[2] = source[0];
         destination[3] = source[1];
         source += 2;
         destination += 4;
     }
 }
 
 template<> void unpack<WebGLImageConversion::DataFormatAR8, uint8_t, uint8_t>(const uint8_t* source, uint8_t* destination, unsigned pixelsPerRow)
 {
     for (unsigned i = 0; i < pixelsPerRow; ++i) {
         destination[0] = source[1];
         destination[1] = source[1];
         destination[2] = source[1];
         destination[3] = source[0];
         source += 2;
         destination += 4;
     }
 }
 
-template<> void unpack<WebGLImageConversion::DataFormatA8, uint8_t, uint8_t>(const uint8_t* source, uint8_t* destination, unsigned pixelsPerRow)
-{
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = 0x0;
-        destination[1] = 0x0;
-        destination[2] = 0x0;
-        destination[3] = source[0];
-        source += 1;
-        destination += 4;
-    }
-}
-
 template<> void unpack<WebGLImageConversion::DataFormatRGBA8, uint8_t, float>(const uint8_t* source, float* destination, unsigned pixelsPerRow)
 {
     const float scaleFactor = 1.0f / 255.0f;
     for (unsigned i = 0; i < pixelsPerRow; ++i) {
         destination[0] = source[0] * scaleFactor;
         destination[1] = source[1] * scaleFactor;
         destination[2] = source[2] * scaleFactor;
         destination[3] = source[3] * scaleFactor;
         source += 4;
         destination += 4;
@@ skipping 32 matching lines @@
     for (unsigned i = 0; i < pixelsPerRow; ++i) {
         destination[0] = source[1] * scaleFactor;
         destination[1] = source[2] * scaleFactor;
         destination[2] = source[3] * scaleFactor;
         destination[3] = source[0] * scaleFactor;
         source += 4;
         destination += 4;
     }
 }
 
-template<> void unpack<WebGLImageConversion::DataFormatRGB8, uint8_t, float>(const uint8_t* source, float* destination, unsigned pixelsPerRow)
-{
-    const float scaleFactor = 1.0f / 255.0f;
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = source[0] * scaleFactor;
-        destination[1] = source[1] * scaleFactor;
-        destination[2] = source[2] * scaleFactor;
-        destination[3] = 1;
-        source += 3;
-        destination += 4;
-    }
-}
-
-template<> void unpack<WebGLImageConversion::DataFormatBGR8, uint8_t, float>(const uint8_t* source, float* destination, unsigned pixelsPerRow)
-{
-    const float scaleFactor = 1.0f / 255.0f;
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = source[2] * scaleFactor;
-        destination[1] = source[1] * scaleFactor;
-        destination[2] = source[0] * scaleFactor;
-        destination[3] = 1;
-        source += 3;
-        destination += 4;
-    }
-}
-
-template<> void unpack<WebGLImageConversion::DataFormatRGB32F, float, float>(const float* source, float* destination, unsigned pixelsPerRow)
-{
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = source[0];
-        destination[1] = source[1];
-        destination[2] = source[2];
-        destination[3] = 1;
-        source += 3;
-        destination += 4;
-    }
-}
-
-template<> void unpack<WebGLImageConversion::DataFormatR32F, float, float>(const float* source, float* destination, unsigned pixelsPerRow)
-{
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = source[0];
-        destination[1] = source[0];
-        destination[2] = source[0];
-        destination[3] = 1;
-        source += 1;
-        destination += 4;
-    }
-}
-
 template<> void unpack<WebGLImageConversion::DataFormatRA32F, float, float>(const float* source, float* destination, unsigned pixelsPerRow)
 {
     for (unsigned i = 0; i < pixelsPerRow; ++i) {
         destination[0] = source[0];
         destination[1] = source[0];
         destination[2] = source[0];
         destination[3] = source[1];
         source += 2;
         destination += 4;
     }
 }
 
-template<> void unpack<WebGLImageConversion::DataFormatA32F, float, float>(const float* source, float* destination, unsigned pixelsPerRow)
-{
-    for (unsigned i = 0; i < pixelsPerRow; ++i) {
-        destination[0] = 0;
-        destination[1] = 0;
-        destination[2] = 0;
-        destination[3] = source[0];
-        source += 1;
-        destination += 4;
-    }
-}
-
 //----------------------------------------------------------------------
 // Pixel packing routines.
 //
 
 template<int format, int alphaOp, typename SourceType, typename DstType>
 void pack(const SourceType*, DstType*, unsigned)
 {
     ASSERT_NOT_REACHED();
 }
 
@@ skipping 774 matching lines @@
     OwnPtr<uint8_t[]> m_unpackedIntermediateSrcData;
 };
 
 void FormatConverter::convert(WebGLImageConversion::DataFormat srcFormat, WebGLImageConversion::DataFormat dstFormat, WebGLImageConversion::AlphaOp alphaOp)
 {
 #define FORMATCONVERTER_CASE_SRCFORMAT(SrcFormat) \
     case SrcFormat: \
         return convert<SrcFormat>(dstFormat, alphaOp);
 
         switch (srcFormat) {
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatR8)
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatA8)
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatR32F)
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatA32F)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRA8)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRA32F)
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRGB8)
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatBGR8)
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRGB565)
-            FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRGB32F)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRGBA8)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatARGB8)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatABGR8)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatAR8)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatBGRA8)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRGBA5551)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRGBA4444)
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRGBA32F)
         default:
             ASSERT_NOT_REACHED();
@@ skipping 510 matching lines @@
     }
 
     FormatConverter converter(width, height, sourceData, destinationData, srcStride, dstStride);
     converter.convert(sourceDataFormat, dstDataFormat, alphaOp);
     if (!converter.Success())
         return false;
     return true;
 }
 
 } // namespace blink