Revert of 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;
 
-static SkPMColor get_canvas_color(int x, int y) {
+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) {
         case 0:
             a = 0xff;
             break;
         case 1:
             a = 0x80;
             break;
         case 2:
             a = 0xCC;
             break;
         case 3:
             a = 0x00;
             break;
         case 4:
             a = 0x01;
             break;
     }
     return SkPremultiplyARGBInline(a, r, g, b);
 }
 
 // assumes any premu/.unpremul has been applied
-static uint32_t pack_color_type(SkColorType ct, U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
+static uint32_t packColorType(SkColorType ct, U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
     uint32_t r32;
     uint8_t* result = reinterpret_cast<uint8_t*>(&r32);
     switch (ct) {
         case kBGRA_8888_SkColorType:
             result[0] = b;
             result[1] = g;
             result[2] = r;
             result[3] = a;
             break;
         case kRGBA_8888_SkColorType:
             result[0] = r;
             result[1] = g;
             result[2] = b;
             result[3] = a;
             break;
         default:
             SkASSERT(0);
             return 0;
     }
     return r32;
 }
 
-static uint32_t get_bitmap_color(int x, int y, int w, SkColorType ct, SkAlphaType at) {
+static uint32_t getBitmapColor(int x, int y, int w, SkColorType ct, SkAlphaType at) {
     int n = y * w + x;
     U8CPU b = n & 0xff;
     U8CPU g = (n >> 8) & 0xff;
     U8CPU r = (n >> 16) & 0xff;
     U8CPU a = 0;
     switch ((x+y) % 5) {
         case 4:
             a = 0xff;
             break;
         case 3:
             a = 0x80;
             break;
         case 2:
             a = 0xCC;
             break;
         case 1:
             a = 0x01;
             break;
         case 0:
             a = 0x00;
             break;
     }
     if (kPremul_SkAlphaType == at) {
         r = SkMulDiv255Ceiling(r, a);
         g = SkMulDiv255Ceiling(g, a);
         b = SkMulDiv255Ceiling(b, a);
     }
-    return pack_color_type(ct, a, r, g , b);
+    return packColorType(ct, a, r, g , b);
 }
 
-static void fill_canvas(SkCanvas* canvas) {
+static void fillCanvas(SkCanvas* canvas) {
     SkBitmap bmp;
     if (bmp.isNull()) {
         bmp.allocN32Pixels(DEV_W, DEV_H);
         for (int y = 0; y < DEV_H; ++y) {
             for (int x = 0; x < DEV_W; ++x) {
-                *bmp.getAddr32(x, y) = get_canvas_color(x, y);
+                *bmp.getAddr32(x, y) = getCanvasColor(x, y);
             }
         }
     }
     canvas->save();
     canvas->setMatrix(SkMatrix::I());
     canvas->clipRect(DEV_RECT_S, SkRegion::kReplace_Op);
     SkPaint paint;
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     canvas->drawBitmap(bmp, 0, 0, &paint);
     canvas->restore();
@@ skipping 26 matching lines @@
         case kBGRA_8888_SkColorType:
             color = SkSwizzle_BGRA_to_PMColor(color);
             break;
         default:
             SkASSERT(0);
             break;
     }
     return color;
 }
 
-static bool check_pixel(SkPMColor a, SkPMColor b, bool didPremulConversion) {
+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));
     int32_t bR = static_cast<int32_t>(SkGetPackedR32(b));
@@ skipping 34 matching lines @@
 
     const SkImageInfo bmInfo = bitmap.info();
 
     SkIRect writeRect = SkIRect::MakeXYWH(writeX, writeY, bitmap.width(), bitmap.height());
     for (int cy = 0; cy < DEV_H; ++cy) {
         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 = get_bitmap_color(bx, by, bitmap.width(),
+                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);
-                if (!check_pixel(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);
+                bool check = checkPixel(bmpPMColor, canvasPixel, mul);
+                REPORTER_ASSERT(reporter, check);
+                if (!check) {
                     return false;
                 }
             } else {
-                SkPMColor testColor = get_canvas_color(cx, cy);
-                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);
+                bool check;
+                SkPMColor testColor = getCanvasColor(cx, cy);
+                REPORTER_ASSERT(reporter, check = (canvasPixel == testColor));
+                if (!check) {
                     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 28 matching lines @@
     {kGpu_TopLeft_DevType, true}, // row bytes has no meaning on gpu devices
 #endif
 };
 
 #include "SkMallocPixelRef.h"
 
 // This is a tricky pattern, because we have to setConfig+rowBytes AND specify
 // a custom pixelRef (which also has to specify its rowBytes), so we have to be
 // sure that the two rowBytes match (and the infos match).
 //
-static bool alloc_row_bytes(SkBitmap* bm, const SkImageInfo& info, size_t rowBytes) {
+static bool allocRowBytes(SkBitmap* bm, const SkImageInfo& info, size_t rowBytes) {
     if (!bm->setInfo(info, rowBytes)) {
         return false;
     }
     SkPixelRef* pr = SkMallocPixelRef::NewAllocate(info, rowBytes, NULL);
     bm->setPixelRef(pr)->unref();
     return true;
 }
 
 static void free_pixels(void* pixels, void* ctx) {
     sk_free(pixels);
@@ skipping 25 matching lines @@
             SkAutoTUnref<GrTexture> texture(grCtx->textureProvider()->createTexture(desc, false));
             return SkSurface::NewRenderTargetDirect(texture->asRenderTarget());
 #endif
     }
     return NULL;
 }
 
 static bool setup_bitmap(SkBitmap* bm, SkColorType ct, SkAlphaType at, int w, int h, int tightRB) {
     size_t rowBytes = tightRB ? 0 : 4 * w + 60;
     SkImageInfo info = SkImageInfo::Make(w, h, ct, at);
-    if (!alloc_row_bytes(bm, info, rowBytes)) {
+    if (!allocRowBytes(bm, info, rowBytes)) {
         return false;
     }
     SkAutoLockPixels alp(*bm);
     for (int y = 0; y < h; ++y) {
         for (int x = 0; x < w; ++x) {
-            *bm->getAddr32(x, y) = get_bitmap_color(x, y, w, ct, at);
+            *bm->getAddr32(x, y) = getBitmapColor(x, y, w, ct, at);
         }
     }
     return true;
 }
 
 static void call_writepixels(SkCanvas* canvas) {
     const SkImageInfo info = SkImageInfo::MakeN32Premul(1, 1);
     SkPMColor pixel = 0;
     canvas->writePixels(info, &pixel, sizeof(SkPMColor), 0, 0);
 }
@@ skipping 96 matching lines @@
                 { kBGRA_8888_SkColorType, kPremul_SkAlphaType },
                 { kBGRA_8888_SkColorType, kUnpremul_SkAlphaType },
             };
             for (size_t r = 0; r < SK_ARRAY_COUNT(testRects); ++r) {
                 const SkIRect& rect = testRects[r];
                 for (int tightBmp = 0; tightBmp < 2; ++tightBmp) {
                     for (size_t c = 0; c < SK_ARRAY_COUNT(gSrcConfigs); ++c) {
                         const SkColorType ct = gSrcConfigs[c].fColorType;
                         const SkAlphaType at = gSrcConfigs[c].fAlphaType;
 
-                        fill_canvas(&canvas);
+                        fillCanvas(&canvas);
                         SkBitmap bmp;
                         REPORTER_ASSERT(reporter, setup_bitmap(&bmp, ct, at, rect.width(),
                                                                rect.height(), SkToBool(tightBmp)));
                         uint32_t idBefore = surface->generationID();
 
                        // sk_tool_utils::write_pixels(&canvas, bmp, rect.fLeft, rect.fTop, ct, at);
                         canvas.writePixels(bmp, rect.fLeft, rect.fTop);
 
                         uint32_t idAfter = surface->generationID();
                         REPORTER_ASSERT(reporter, check_write(reporter, &canvas, bmp,
                                                               rect.fLeft, rect.fTop));
 
                         // we should change the genID iff pixels were actually written.
                         SkIRect canvasRect = SkIRect::MakeSize(canvas.getDeviceSize());
                         SkIRect writeRect = SkIRect::MakeXYWH(rect.fLeft, rect.fTop,
                                                               bmp.width(), bmp.height());
                         bool intersects = SkIRect::Intersects(canvasRect, writeRect) ;
                         REPORTER_ASSERT(reporter, intersects == (idBefore != idAfter));
                     }
                 }
             }
         }
     }
 }