Make SkGpuDevice know its alpha type

tests/SurfaceTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDevice.h"
@@ skipping 12 matching lines @@
 #else
 class GrContextFactory;
 class GrContext;
 #endif
 
 enum SurfaceType {
     kRaster_SurfaceType,
     kRasterDirect_SurfaceType,
     kGpu_SurfaceType,
     kGpuScratch_SurfaceType,
+
+    kLastSurfaceType = kGpuScratch_SurfaceType
 };
+static const int kSurfaceTypeCnt = kLastSurfaceType + 1;
 
 static void release_storage(void* pixels, void* context) {
     SkASSERT(pixels == context);
     sk_free(pixels);
 }
 

[robertphillips, 2015/06/23 19:48:09]

create_surface ?

[bsalomon, 2015/06/25 21:47:18]

Done.

 static SkSurface* createSurface(SurfaceType surfaceType, GrContext* context,
+                                SkAlphaType at = kPremul_SkAlphaType,
                                 SkImageInfo* requestedInfo = NULL) {
-    static const SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
+    const SkImageInfo info = SkImageInfo::MakeN32(10, 10, at);
 
     if (requestedInfo) {
         *requestedInfo = info;
     }
 
     switch (surfaceType) {
         case kRaster_SurfaceType:
             return SkSurface::NewRaster(info);
         case kRasterDirect_SurfaceType: {
             const size_t rowBytes = info.minRowBytes();
@@ skipping 357 matching lines @@
         context = factory->get(glCtxType);
 
         if (NULL == context) {
             continue;
         }
 #endif
         for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
             SkImageInfo info, requestInfo;
             size_t rowBytes;
 
             SkAutoTUnref<SkSurface> surface(createSurface(gRec[i].fType, context,

[robertphillips, 2015/06/23 19:48:09]

tab over ?

[bsalomon, 2015/06/25 21:47:18]

Done.

-                                                          &requestInfo));
+                kPremul_SkAlphaType, &requestInfo));
             surface->getCanvas()->clear(color);
 
             const void* addr = surface->getCanvas()->peekPixels(&info, &rowBytes);
             bool success = SkToBool(addr);
             REPORTER_ASSERT(reporter, gRec[i].fPeekShouldSucceed == success);
 
             SkImageInfo info2;
             size_t rb2;
             const void* addr2 = surface->peekPixels(&info2, &rb2);
 
@@ skipping 45 matching lines @@
         }
         context = factory->get(glCtxType);
         
         if (NULL == context) {
             continue;
         }
 #endif
         for (size_t j = 0; j < SK_ARRAY_COUNT(gRec); ++j) {
             SkImageInfo info, requestInfo;
             
             SkAutoTUnref<SkSurface> surface(createSurface(gRec[j].fType, context,

[robertphillips, 2015/06/23 19:48:09]

tab over ?

[bsalomon, 2015/06/25 21:47:18]

Done.

-                                                          &requestInfo));
+                kPremul_SkAlphaType,  &requestInfo));
             SkCanvas* canvas = surface->getCanvas();
             canvas->clear(0);
 
             SkBaseDevice* device = canvas->getDevice_just_for_deprecated_compatibility_testing();
             SkBitmap bm = device->accessBitmap(false);
             uint32_t genID0 = bm.getGenerationID();
             // Now we draw something, which needs to "dirty" the genID (sorta like copy-on-write)
             canvas->drawColor(SK_ColorBLUE);
             // Now check that we get a different genID
             uint32_t genID1 = bm.getGenerationID();
             REPORTER_ASSERT(reporter, genID0 != genID1);
         }
     }
 }
 
+static void test_snap_alphatype(skiatest::Reporter* reporter, GrContextFactory* factory) {
+    GrContext* context = NULL;
+#if SK_SUPPORT_GPU
+    context = factory->get(GrContextFactory::kNative_GLContextType);
+    if (NULL == context) {
+        return;
+    }
+#endif
+    for (int opaque = 0; opaque < 2; ++opaque) {
+        SkAlphaType atype = SkToBool(opaque) ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+        for (int st = 0; st < kSurfaceTypeCnt; ++st) {
+            SurfaceType stype = (SurfaceType)st;
+            SkAutoTUnref<SkSurface> surface(createSurface(stype, context, atype));
+            REPORTER_ASSERT(reporter, surface);
+            if (surface) {
+                SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
+                REPORTER_ASSERT(reporter, image);
+                if (image) {
+                    REPORTER_ASSERT(reporter, image->isOpaque() == SkToBool(opaque));
+                }
+            }
+        }
+    }
+}
+
 static void TestSurfaceCopyOnWrite(skiatest::Reporter* reporter, SurfaceType surfaceType,
                                    GrContext* context) {
     // Verify that the right canvas commands trigger a copy on write
     SkSurface* surface = createSurface(surfaceType, context);
     SkAutoTUnref<SkSurface> aur_surface(surface);
     SkCanvas* canvas = surface->getCanvas();
 
     const SkRect testRect =
         SkRect::MakeXYWH(SkIntToScalar(0), SkIntToScalar(0),
                          SkIntToScalar(4), SkIntToScalar(5));
@@ skipping 219 matching lines @@
     TestSurfaceNoCanvas(reporter, kRaster_SurfaceType, NULL, SkSurface::kRetain_ContentChangeMode);
 
     test_empty_image(reporter);
     test_empty_surface(reporter, NULL);
 
     test_imagepeek(reporter, factory);
     test_canvaspeek(reporter, factory);
 
     test_accessPixels(reporter, factory);
 
+    test_snap_alphatype(reporter, factory);
+
 #if SK_SUPPORT_GPU
     TestGetTexture(reporter, kRaster_SurfaceType, NULL);
     if (factory) {
         for (int i= 0; i < GrContextFactory::kGLContextTypeCnt; ++i) {
             GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i;
             if (!GrContextFactory::IsRenderingGLContext(glCtxType)) {
                 continue;
             }
             GrContext* context = factory->get(glCtxType);
             if (context) {
@@ skipping 107 matching lines @@
     // We expect the ref'd image to see the new color, but cpy'd one should still see the old color
     test_image_color(reporter, refImg, expected1);
     test_image_color(reporter, cpyImg, expected0);
 
     // Now exercise the release proc
     REPORTER_ASSERT(reporter, !releaseCtx.fIsReleased);
     refImg.reset(NULL); // force a release of the image
     REPORTER_ASSERT(reporter, releaseCtx.fIsReleased);
 }
 #endif