commit 522095f7d7fe04bf1479a20a9707372d988a9da2
author Jamie Madill <jmadill@chromium.org> Mon Jul 23 14:59:41 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Jul 23 20:37:24 2018 +0000
tree 22973b860a0600e76a614c367d31a38059e179a4
parent b436aac31d667059956c9348a3baf8f27ca7395e

Rename "color" functions to "pixel" functions.

This extends of the copy, read and write functions to cover depth and
stencil formats.

Refactoring change only.

Bug: angleproject:2673
Change-Id: I4b0b2f4cf8621051cacd95cdbd6d70f94ca612e2
Reviewed-on: https://chromium-review.googlesource.com/1147152
Reviewed-by: Geoff Lang <geofflang@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 5b2679c..6230556 100644
--- a/src/libANGLE/renderer/renderer_utils.cpp
+++ b/src/libANGLE/renderer/renderer_utils.cpp
@@ -84,7 +84,7 @@
 }
 
 void WriteUintColor(const gl::ColorF &color,
-                    ColorWriteFunction colorWriteFunction,
+                    PixelWriteFunction colorWriteFunction,
                     uint8_t *destPixelData)
 {
     gl::ColorUI destColor(
@@ -94,7 +94,7 @@
 }
 
 void WriteFloatColor(const gl::ColorF &color,
-                     ColorWriteFunction colorWriteFunction,
+                     PixelWriteFunction colorWriteFunction,
                      uint8_t *destPixelData)
 {
     colorWriteFunction(reinterpret_cast<const uint8_t *>(&color), destPixelData);
@@ -211,7 +211,7 @@
         return;
     }
 
-    ColorCopyFunction fastCopyFunc = sourceFormat.fastCopyFunctions.get(params.destFormat->id);
+    PixelCopyFunction fastCopyFunc = sourceFormat.fastCopyFunctions.get(params.destFormat->id);
 
     if (fastCopyFunc)
     {
@@ -230,8 +230,8 @@
         return;
     }
 
-    ColorWriteFunction colorWriteFunction = params.destFormat->colorWriteFunction;
-    ASSERT(colorWriteFunction != nullptr);
+    PixelWriteFunction pixelWriteFunction = params.destFormat->pixelWriteFunction;
+    ASSERT(pixelWriteFunction != nullptr);
 
     // Maximum size of any Color<T> type used.
     uint8_t temp[16];
@@ -240,8 +240,8 @@
                       sizeof(temp) >= sizeof(angle::DepthStencil),
                   "Unexpected size of pixel struct.");
 
-    ColorReadFunction colorReadFunction = sourceFormat.colorReadFunction;
-    ASSERT(colorReadFunction != nullptr);
+    PixelReadFunction pixelReadFunction = sourceFormat.pixelReadFunction;
+    ASSERT(pixelReadFunction != nullptr);
 
     for (int y = 0; y < params.area.height; ++y)
     {
@@ -253,8 +253,8 @@
 
             // readFunc and writeFunc will be using the same type of color, CopyTexImage
             // will not allow the copy otherwise.
-            colorReadFunction(src, temp);
-            colorWriteFunction(temp, dest);
+            pixelReadFunction(src, temp);
+            pixelWriteFunction(temp, dest);
         }
     }
 }
@@ -264,7 +264,7 @@
     return (get(formatID) != nullptr);
 }
 
-ColorCopyFunction FastCopyFunctionMap::get(angle::FormatID formatID) const
+PixelCopyFunction FastCopyFunctionMap::get(angle::FormatID formatID) const
 {
     for (size_t index = 0; index < mSize; ++index)
     {
@@ -307,11 +307,11 @@
 void CopyImageCHROMIUM(const uint8_t *sourceData,
                        size_t sourceRowPitch,
                        size_t sourcePixelBytes,
-                       ColorReadFunction colorReadFunction,
+                       PixelReadFunction pixelReadFunction,
                        uint8_t *destData,
                        size_t destRowPitch,
                        size_t destPixelBytes,
-                       ColorWriteFunction colorWriteFunction,
+                       PixelWriteFunction pixelWriteFunction,
                        GLenum destUnsizedFormat,
                        GLenum destComponentType,
                        size_t width,
@@ -363,7 +363,7 @@
             const uint8_t *sourcePixelData = sourceData + y * sourceRowPitch + x * sourcePixelBytes;
 
             gl::ColorF sourceColor;
-            colorReadFunction(sourcePixelData, reinterpret_cast<uint8_t *>(&sourceColor));
+            pixelReadFunction(sourcePixelData, reinterpret_cast<uint8_t *>(&sourceColor));
 
             conversionFunction(&sourceColor);
             clipChannelsFunction(&sourceColor);
@@ -380,7 +380,7 @@
             }
 
             uint8_t *destPixelData = destData + destY * destRowPitch + x * destPixelBytes;
-            writeFunction(sourceColor, colorWriteFunction, destPixelData);
+            writeFunction(sourceColor, pixelWriteFunction, destPixelData);
         }
     }
 }