- Add astcbitmap to gm slides

src/utils/SkTextureCompressor_ASTC.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTextureCompressor_ASTC.h"
 #include "SkTextureCompressor_Blitter.h"
 
@@ skipping 775 matching lines @@
     while (nVals > 0) {
 
         if (nTrits > 0) {
             SkASSERT(0 == nQuints);
 
             int endBlockBit = startBit + 8 + 5*nBits;
             if (endBlockBit > endBit) {
                 endBlockBit = endBit;
             }
 
-            decode_trit_block(dst, nBits, read_astc_bits(src, startBit, endBlockBit));
+            // Trit blocks are three values large.
+            int trits[5];
+            decode_trit_block(trits, nBits, read_astc_bits(src, startBit, endBlockBit));
+            memcpy(dst, trits, SkMin32(nVals, 5)*sizeof(int));
+
             dst += 5;
             nVals -= 5;
             startBit = endBlockBit;
 
         } else if (nQuints > 0) {
             SkASSERT(0 == nTrits);
 
             int endBlockBit = startBit + 7 + 3*nBits;
             if (endBlockBit > endBit) {
                 endBlockBit = endBit;
             }
 
-            decode_quint_block(dst, nBits, read_astc_bits(src, startBit, endBlockBit));
+            // Quint blocks are three values large
+            int quints[3];
+            decode_quint_block(quints, nBits, read_astc_bits(src, startBit, endBlockBit));
+            memcpy(dst, quints, SkMin32(nVals, 3)*sizeof(int));
+
             dst += 3;
             nVals -= 3;
             startBit = endBlockBit;
 
         } else {
             // Just read the bits, but don't read more than we have...
             int endValBit = startBit + nBits;
             if (endValBit > endBit) {
                 endValBit = endBit;
             }
@@ skipping 881 matching lines @@
                 break;
 
             default:
                 SkDEBUGFAIL("Internal ASTC decoding error.");
                 break;
         }
 
         // The rest of the CEM config will be between the dual plane bit selector
         // and the texel weight grid.
         const int lowCEM = static_cast<int>(read_astc_bits(fBlock, 23, 29));
-        SkASSERT(lastWeight - dualPlaneBitLoc > 31);
+        SkASSERT(lastWeight >= dualPlaneBitLoc);
+        SkASSERT(lastWeight - dualPlaneBitLoc < 31);
         int fullCEM = static_cast<int>(read_astc_bits(fBlock, dualPlaneBitLoc, lastWeight));
 
         // Attach the config at the end of the weight grid to the CEM values
         // in the beginning of the block.
         fullCEM = (fullCEM << 6) | lowCEM;
 
         // Ignore the two least significant bits, since those are our baseCEM above.
         fullCEM = fullCEM >> 2;
 
         int C[kMaxPartitions]; // Next, decode C and M from the spec (Table C.2.12)
@@ skipping 310 matching lines @@
             read_astc_block(&data, src);
             decompress_astc_block(reinterpret_cast<uint8_t*>(colorPtr + x), dstRowBytes, data);
 
             // ASTC encoded blocks are 16 bytes (128 bits) large.
             src += 16;
         }
     }
 }
 
 }  // SkTextureCompressor