Generalize mask helper a bit for compression

src/gpu/GrSWMaskHelper.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrSWMaskHelper.h"
 
 #include "GrDrawState.h"
@@ skipping 84 matching lines @@
         fMatrix = *matrix;
     } else {
         fMatrix.setIdentity();
     }
 
     // Now translate so the bound's UL corner is at the origin
     fMatrix.postTranslate(-resultBounds.fLeft * SK_Scalar1,
                           -resultBounds.fTop * SK_Scalar1);
     SkIRect bounds = SkIRect::MakeWH(resultBounds.width(),
                                      resultBounds.height());
+#if GR_COMPRESS_ALPHA_MASK
+    // Make sure that the width is a multiple of 16 so that we can use
+    // specialized SIMD instructions that compress 4 blocks at a time.
+    const int cmpWidth = (bounds.fRight + 15) & ~15;
+    const int cmpHeight = (bounds.fBottom + 3) & ~3;
+#else
+    const int cmpWidth = bounds.fRight;
+    const int cmpHeight = bounds.fBottom;
+#endif
 
-    if (!fBM.allocPixels(SkImageInfo::MakeA8(bounds.fRight, bounds.fBottom))) {
+    if (!fBM.allocPixels(SkImageInfo::MakeA8(cmpWidth, cmpHeight))) {
         return false;
     }
+
     sk_bzero(fBM.getPixels(), fBM.getSafeSize());
 
     sk_bzero(&fDraw, sizeof(fDraw));
     fRasterClip.setRect(bounds);
     fDraw.fRC    = &fRasterClip;
     fDraw.fClip  = &fRasterClip.bwRgn();
     fDraw.fMatrix = &fMatrix;
     fDraw.fBitmap = &fBM;
     return true;
 }
 
 /**
  * Get a texture (from the texture cache) of the correct size & format.
  * Return true on success; false on failure.
  */

[robertphillips, 2014/07/16 12:13:23]

Move these two into getTexture (to limit their scope) ?
Can they go inside the GR_COMPRESS_ALPHA_MASK block ?

[krajcevski, 2014/07/16 13:43:02]

Done.

+static const int kCompressedBlockSize = 4;
+static const GrPixelConfig kCompressedConfig = kR11_EAC_GrPixelConfig;
 bool GrSWMaskHelper::getTexture(GrAutoScratchTexture* texture) {
     GrTextureDesc desc;
     desc.fWidth = fBM.width();
     desc.fHeight = fBM.height();
+    desc.fConfig = kAlpha_8_GrPixelConfig;
 
 #if GR_COMPRESS_ALPHA_MASK
-    static const int kLATCBlockSize = 4;
-    if (desc.fWidth % kLATCBlockSize == 0 && desc.fHeight % kLATCBlockSize == 0) {
-        desc.fConfig = kLATC_GrPixelConfig;
-    } else {
-#endif
-        desc.fConfig = kAlpha_8_GrPixelConfig;
-#if GR_COMPRESS_ALPHA_MASK
+    if (desc.fWidth % kCompressedBlockSize == 0 &&
+        desc.fHeight % kCompressedBlockSize == 0) {
+        desc.fConfig = kCompressedConfig;
     }
 #endif
 

[robertphillips, 2014/07/16 12:13:23]

Move this into the GR_COMPRESS_ALPHA_MASK block ?

[krajcevski, 2014/07/16 13:43:02]

Hrm, it doesn't need to be. The passed config should be texturable, but if we're
not compressing then it'll just be a no-op.

+    // If this config isn't supported then we should fall back to A8
+    if (!(fContext->getGpu()->caps()->isConfigTexturable(desc.fConfig))) {
+        desc.fConfig = kAlpha_8_GrPixelConfig;
+    }
+
     texture->set(fContext, desc);
     return NULL != texture->texture();
 }
 
 void GrSWMaskHelper::sendTextureData(GrTexture *texture, const GrTextureDesc& desc,
                                      const void *data, int rowbytes) {
     // If we aren't reusing scratch textures we don't need to flush before
     // writing since no one else will be using 'texture'
     bool reuseScratch = fContext->getGpu()->caps()->reuseScratchTextures();
 
     // Since we're uploading to it, and it's compressed, 'texture' shouldn't
     // have a render target.
     SkASSERT(NULL == texture->asRenderTarget());
 
     texture->writePixels(0, 0, desc.fWidth, desc.fHeight,
                          desc.fConfig, data, rowbytes,
                          reuseScratch ? 0 : GrContext::kDontFlush_PixelOpsFlag);
 }
 
+void GrSWMaskHelper::compressTextureData(GrTexture *texture, const GrTextureDesc& desc) {

[robertphillips, 2014/07/16 12:13:23]

// SkASSERT(GrPixelConfigIsCompressed(desc.fConfig)); ?

[krajcevski, 2014/07/16 13:43:02]

Done.

+    SkTextureCompressor::Format format = SkTextureCompressor::kLATC_Format;

[robertphillips, 2014/07/16 12:13:23]

// Compress to the format required by 'texture' ?

[krajcevski, 2014/07/16 13:43:02]

Done.

+    switch(desc.fConfig) {
+        case kLATC_GrPixelConfig:
+            format = SkTextureCompressor::kLATC_Format;
+            break;
+        case kR11_EAC_GrPixelConfig:
+            format = SkTextureCompressor::kR11_EAC_Format;
+            break;
+        default:
+            SkFAIL("Unrecognized texture compression format.");
+            break;
+    }
+
+    SkAutoDataUnref cmpData(SkTextureCompressor::CompressBitmapToFormat(fBM, format));
+    SkASSERT(NULL != cmpData);
+
+    this->sendTextureData(texture, desc, cmpData->data(), 0);
+}
+
 /**
  * Move the result of the software mask generation back to the gpu
  */
 void GrSWMaskHelper::toTexture(GrTexture *texture) {
     SkAutoLockPixels alp(fBM);
 
     GrTextureDesc desc;
     desc.fWidth = fBM.width();
     desc.fHeight = fBM.height();
     desc.fConfig = texture->config();
         
     // First see if we should compress this texture before uploading.
-    if (texture->config() == kLATC_GrPixelConfig) {
-        SkTextureCompressor::Format format = SkTextureCompressor::kLATC_Format;
-        SkAutoDataUnref latcData(SkTextureCompressor::CompressBitmapToFormat(fBM, format));
-        SkASSERT(NULL != latcData);
-
-        this->sendTextureData(texture, desc, latcData->data(), 0);
+    if (GrPixelConfigIsCompressed(texture->config())) {
+        this->compressTextureData(texture, desc);
     } else {
         // Looks like we have to send a full A8 texture. 
         this->sendTextureData(texture, desc, fBM.getPixels(), fBM.rowBytes());
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 /**
  * Software rasterizes path to A8 mask (possibly using the context's matrix)
  * and uploads the result to a scratch texture. Returns the resulting
@@ skipping 49 matching lines @@
     maskMatrix.preConcat(drawState->getViewMatrix());
 
     drawState->addCoverageEffect(
                          GrSimpleTextureEffect::Create(texture,
                                                        maskMatrix,
                                                        GrTextureParams::kNone_FilterMode,
                                                        kPosition_GrCoordSet))->unref();
 
     target->drawSimpleRect(dstRect);
 }