Make readback of alpha channel work for RGBA.

src/gpu/GrSwizzle.h

Index: src/gpu/GrSwizzle.h
diff --git a/src/gpu/GrSwizzle.h b/src/gpu/GrSwizzle.h
index 87ea9534b9e021bfc6d5b1d0e942b1c5168307fd..6509362187cb89026814d1e6e716db77c06c1aaf 100644
--- a/src/gpu/GrSwizzle.h
+++ b/src/gpu/GrSwizzle.h
@@ -9,6 +9,7 @@
 #define GrSwizzle_DEFINED
 
 #include "GrTypes.h"
+#include "GrColor.h"
 
 /** Represents a rgba swizzle. It can be converted either into a string or a eight bit int.
     Currently there is no way to specify an arbitrary swizzle, just some static swizzles and an
@@ -17,6 +18,17 @@ class GrSwizzle {
 public:
     GrSwizzle() { *this = RGBA(); }
 
+    GrSwizzle(const GrSwizzle& that) { *this = that; }
+
+    void setFromKey(uint8_t key) {
+        fKey = key;
+        for (int i = 0; i < 4; ++i) {
+            fSwiz[i] = IdxToChar(key & 3);
+            key >>= 2;
+        }
+        SkASSERT(fSwiz[4] == 0);
+    }
+
     GrSwizzle& operator=(const GrSwizzle& that) {
         memcpy(this, &that, sizeof(GrSwizzle));
         return *this;
@@ -32,6 +44,29 @@ public:
     /** 4 char null terminated string consisting only of chars 'r', 'g', 'b', 'a'. */
     const char* c_str() const { return fSwiz; }
 
+    GrColor applyTo(GrColor color) const {
+        int idx;
+        uint32_t key = fKey;
+
+        // Index of the input color that should be mapped to output r.
+        idx = (key & 3);
+        uint32_t outR = (color >> idx * 8)  & 0xFF;
+        key >>= 2;
+
+        idx = (key & 3);
+        uint32_t outG = (color >> idx * 8)  & 0xFF;
+        key >>= 2;
+
+        idx = (key & 3);
+        uint32_t outB = (color >> idx * 8)  & 0xFF;
+        key >>= 2;
+
+        idx = (key & 3);
+        uint32_t outA = (color >> idx * 8)  & 0xFF;
+
+        return GrColorPackRGBA(outR, outG, outB, outA);
+    }
+
     static const GrSwizzle& RGBA() {
         static GrSwizzle gRGBA("rgba");
         return gRGBA;
@@ -59,19 +94,32 @@ private:
     static int CharToIdx(char c) {
         switch (c) {
             case 'r':
-                return 0;
+                return (GrColor_SHIFT_R / 8);
             case 'g':
-                return 1;
+                return (GrColor_SHIFT_G / 8);
             case 'b':
-                return 2;
+                return (GrColor_SHIFT_B/ 8);
             case 'a':
-                return 3;
+                return (GrColor_SHIFT_A / 8);
             default:
                 SkFAIL("Invalid swizzle char");
                 return 0;
         }
     }
 
+    static /* constexpr */ char IToC(int idx) {
+        return (8*idx) == GrColor_SHIFT_R ? 'r' :
+               (8*idx) == GrColor_SHIFT_G ? 'g' :
+               (8*idx) == GrColor_SHIFT_B ? 'b' : 
+               'a';
+    }
+
+    static char IdxToChar(int c) {
+        // Hopefully this array gets computed at compile time.
+        static const char gStr[4] = { IToC(0), IToC(1), IToC(2), IToC(3) };
+        return gStr[c];
+    }
+
     explicit GrSwizzle(const char* str) {
         SkASSERT(strlen(str) == 4);
         fSwiz[0] = str[0];
@@ -83,7 +131,6 @@ private:
                       (CharToIdx(fSwiz[2]) << 4) | (CharToIdx(fSwiz[3]) << 6));
     }
 
-    uint32_t* asUIntPtr() { return SkTCast<uint32_t*>(fSwiz); }
     uint32_t asUInt() const { return *SkTCast<const uint32_t*>(fSwiz); }
 
     GR_STATIC_ASSERT(sizeof(char[4]) == sizeof(uint32_t));