commit 86e0b7f7f6af7e50864fbfe58e2c4bb80a4b86e0
author Jamie Madill <jmadill@chromium.org> Tue Aug 09 11:10:29 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Aug 11 02:43:12 2016 +0000
tree bf2434f4ac21300a74334e6f16c37c8a1538fb6f
parent a5ac1e1656cb06fb8c893e153c9b260249f6b5cc

Clean up PackPixels.

BUG=angleproject:1455

Change-Id: I263719cc77ff80580a551683d062e862dee1bdab
Reviewed-on: https://chromium-review.googlesource.com/365826
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/renderer_utils.cpp

diff --git a/src/libANGLE/renderer/renderer_utils.cpp b/src/libANGLE/renderer/renderer_utils.cpp
index 140182e..fad6d6b 100644
--- a/src/libANGLE/renderer/renderer_utils.cpp
+++ b/src/libANGLE/renderer/renderer_utils.cpp
@@ -13,6 +13,7 @@
 #include "image_util/imageformats.h"
 
 #include "libANGLE/formatutils.h"
+#include "libANGLE/renderer/Format.h"
 
 #include <string.h>
 
@@ -170,9 +171,8 @@
 }
 
 void PackPixels(const PackPixelsParams &params,
-                const gl::InternalFormat &sourceFormatInfo,
+                const angle::Format &sourceFormat,
                 const FastCopyFunctionMap &fastCopyFunctionsMap,
-                ColorReadFunction colorReadFunction,
                 int inputPitchIn,
                 const uint8_t *sourceIn,
                 uint8_t *destWithoutOffset)
@@ -188,18 +188,20 @@
         inputPitch = -inputPitch;
     }
 
-    if (sourceFormatInfo.format == params.format && sourceFormatInfo.type == params.type)
+    const auto &sourceGLInfo = gl::GetInternalFormatInfo(sourceFormat.glInternalFormat);
+
+    if (sourceGLInfo.format == params.format && sourceGLInfo.type == params.type)
     {
         // Direct copy possible
         for (int y = 0; y < params.area.height; ++y)
         {
             memcpy(destWithOffset + y * params.outputPitch, source + y * inputPitch,
-                   params.area.width * sourceFormatInfo.pixelBytes);
+                   params.area.width * sourceGLInfo.pixelBytes);
         }
         return;
     }
 
-    ASSERT(sourceFormatInfo.pixelBytes > 0);
+    ASSERT(sourceGLInfo.pixelBytes > 0);
 
     gl::FormatType formatType(params.format, params.type);
     ColorCopyFunction fastCopyFunc = GetFastCopyFunction(fastCopyFunctionsMap, formatType);
@@ -215,7 +217,7 @@
             {
                 uint8_t *dest =
                     destWithOffset + y * params.outputPitch + x * destFormatInfo.pixelBytes;
-                const uint8_t *src = source + y * inputPitch + x * sourceFormatInfo.pixelBytes;
+                const uint8_t *src = source + y * inputPitch + x * sourceGLInfo.pixelBytes;
 
                 fastCopyFunc(src, dest);
             }
@@ -231,12 +233,14 @@
                       sizeof(temp) >= sizeof(gl::ColorI),
                   "Unexpected size of gl::Color struct.");
 
+    const auto &colorReadFunction = sourceFormat.colorReadFunction;
+
     for (int y = 0; y < params.area.height; ++y)
     {
         for (int x = 0; x < params.area.width; ++x)
         {
             uint8_t *dest      = destWithOffset + y * params.outputPitch + x * destFormatInfo.pixelBytes;
-            const uint8_t *src = source + y * inputPitch + x * sourceFormatInfo.pixelBytes;
+            const uint8_t *src = source + y * inputPitch + x * sourceGLInfo.pixelBytes;
 
             // readFunc and writeFunc will be using the same type of color, CopyTexImage
             // will not allow the copy otherwise.