Move draw on upload decision in GrGpu

tests/WritePixelsTest.cpp

 /*
  * Copyright 2011 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 "SkColorPriv.h"
 #include "SkMathPriv.h"
 #include "SkRegion.h"
 #include "SkSurface.h"
 #include "Test.h"
 #include "sk_tool_utils.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
 #include "SkGpuDevice.h"
 #else
 class GrContext;
 class GrContextFactory;
 #endif
 
 static const int DEV_W = 100, DEV_H = 100;
 static const SkIRect DEV_RECT = SkIRect::MakeWH(DEV_W, DEV_H);
 static const SkRect DEV_RECT_S = SkRect::MakeWH(DEV_W * SK_Scalar1,
                                                 DEV_H * SK_Scalar1);
 static const U8CPU DEV_PAD = 0xee;
 

[robertphillips, 2015/07/28 13:15:23]

get_canvas_color ?

[bsalomon, 2015/07/28 14:58:17]

Done.

 static SkPMColor getCanvasColor(int x, int y) {
     SkASSERT(x >= 0 && x < DEV_W);
     SkASSERT(y >= 0 && y < DEV_H);
 
     U8CPU r = x;
     U8CPU g = y;
     U8CPU b = 0xc;
 
     U8CPU a = 0x0;
     switch ((x+y) % 5) {
@@ skipping 116 matching lines @@
             break;
         case kBGRA_8888_SkColorType:
             color = SkSwizzle_BGRA_to_PMColor(color);
             break;
         default:
             SkASSERT(0);
             break;
     }
     return color;
 }
 

[robertphillips, 2015/07/28 13:15:23]

check_pixel ?

[bsalomon, 2015/07/28 14:58:18]

Done.

 static bool checkPixel(SkPMColor a, SkPMColor b, bool didPremulConversion) {
     if (!didPremulConversion) {
         return a == b;
     }
     int32_t aA = static_cast<int32_t>(SkGetPackedA32(a));
     int32_t aR = static_cast<int32_t>(SkGetPackedR32(a));
     int32_t aG = static_cast<int32_t>(SkGetPackedG32(a));
     int32_t aB = SkGetPackedB32(a);
 
     int32_t bA = static_cast<int32_t>(SkGetPackedA32(b));
@@ skipping 40 matching lines @@
         for (int cx = 0; cx < DEV_W; ++cx) {
             SkPMColor canvasPixel = canvasPixels[cx];
             if (writeRect.contains(cx, cy)) {
                 int bx = cx - writeX;
                 int by = cy - writeY;
                 uint32_t bmpColor8888 = getBitmapColor(bx, by, bitmap.width(),
                                                        bmInfo.colorType(), bmInfo.alphaType());
                 bool mul = (kUnpremul_SkAlphaType == bmInfo.alphaType());
                 SkPMColor bmpPMColor = convert_to_PMColor(bmInfo.colorType(), bmInfo.alphaType(),
                                                           bmpColor8888);
-                bool check = checkPixel(bmpPMColor, canvasPixel, mul);
-                REPORTER_ASSERT(reporter, check);
-                if (!check) {
+                if (!checkPixel(bmpPMColor, canvasPixel, mul)) {
+                    ERRORF(reporter, "Expected canvas pixel at %d, %d to be 0x%08x, got 0x%08x. "
+                           "Write performed premul: %d", cx, cy, bmpPMColor, canvasPixel, mul);
                     return false;
                 }
             } else {
-                bool check;
                 SkPMColor testColor = getCanvasColor(cx, cy);
-                REPORTER_ASSERT(reporter, check = (canvasPixel == testColor));
-                if (!check) {
+                if (canvasPixel != testColor) {
+                    ERRORF(reporter, "Canvas pixel outside write rect at %d, %d changed."
+                           " Should be 0x%08x, got 0x%08x. ", cx, cy, testColor, canvasPixel);
                     return false;
                 }
             }
         }
         if (cy != DEV_H -1) {
             const char* pad = reinterpret_cast<const char*>(canvasPixels + DEV_W);
             for (size_t px = 0; px < canvasRowBytes - 4 * DEV_W; ++px) {
                 bool check;
                 REPORTER_ASSERT(reporter, check = (pad[px] == static_cast<char>(DEV_PAD)));
                 if (!check) {
@@ skipping 222 matching lines @@
                         SkIRect writeRect = SkIRect::MakeXYWH(rect.fLeft, rect.fTop,
                                                               bmp.width(), bmp.height());
                         bool intersects = SkIRect::Intersects(canvasRect, writeRect) ;
                         REPORTER_ASSERT(reporter, intersects == (idBefore != idAfter));
                     }
                 }
             }
         }
     }
 }