Start using RenderTargetProxy (omnibus)

tests/SRGBMipMapTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #if SK_SUPPORT_GPU
 #include "GrCaps.h"
 #include "GrContext.h"
 #include "GrRenderTargetContext.h"
+#include "GrTextureProxy.h"
+
 #include "SkCanvas.h"
 #include "SkSurface.h"
 
 // using anonymous namespace because these functions are used as template params.
 namespace {
 /** convert 0..1 srgb value to 0..1 linear */
 float srgb_to_linear(float srgb) {
     if (srgb <= 0.04045f) {
         return srgb / 12.92f;
     } else {
@@ skipping 12 matching lines @@
 }
 
 static bool check_value(U8CPU value, U8CPU expected, U8CPU error) {
     if (value >= expected) {
         return (value - expected) <= error;
     } else {
         return (expected - value) <= error;
     }
 }
 
-void read_and_check_pixels(skiatest::Reporter* reporter, GrTexture* texture, U8CPU expected,
+void read_and_check_pixels(skiatest::Reporter* reporter, GrTextureProxy* texture, U8CPU expected,
                            U8CPU error, const char* subtestName) {
     int w = texture->width();
     int h = texture->height();
     SkAutoTMalloc<uint32_t> readData(w * h);
     memset(readData.get(), 0, sizeof(uint32_t) * w * h);
-    if (!texture->readPixels(0, 0, w, h, texture->config(), readData.get())) {
+    if (!texture->readPixels2(0, 0, w, h, texture->config(), readData.get())) {
         ERRORF(reporter, "Could not read pixels for %s.", subtestName);
         return;
     }
     for (int j = 0; j < h; ++j) {
         for (int i = 0; i < w; ++i) {
             uint32_t read = readData[j * w + i];
 
             bool success =
                 check_value(read & 0xff, expected, error) &&
                 check_value((read >> 8) & 0xff, expected, error) &&
@@ skipping 67 matching lines @@
     SkRect rect = SkRect::MakeWH(SkIntToScalar(rtS), SkIntToScalar(rtS));
     GrNoClip noClip;
     GrPaint paint;
     paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
     GrTextureParams mipMapParams(SkShader::kRepeat_TileMode, GrTextureParams::kMipMap_FilterMode);
     paint.addColorTextureProcessor(texture.get(), nullptr, SkMatrix::MakeScale(0.5f), mipMapParams);
 
     // 1) Draw texture to S32 surface (should generate/use sRGB mips)
     paint.setGammaCorrect(true);
     s32RenderTargetContext->drawRect(noClip, paint, SkMatrix::I(), rect);
-    read_and_check_pixels(reporter, s32RenderTargetContext->asTexture().get(), expectedSRGB, error,
+    read_and_check_pixels(reporter, s32RenderTargetContext->asDeferredTexture().get(), expectedSRGB, error,
                           "first render of sRGB");
 
     // 2) Draw texture to L32 surface (should generate/use linear mips)
     paint.setGammaCorrect(false);
     l32RenderTargetContext->drawRect(noClip, paint, SkMatrix::I(), rect);
-    read_and_check_pixels(reporter, l32RenderTargetContext->asTexture().get(), expectedLinear,
+    read_and_check_pixels(reporter, l32RenderTargetContext->asDeferredTexture().get(), expectedLinear,
                           error, "re-render as linear");
 
     // 3) Go back to sRGB
     paint.setGammaCorrect(true);
     s32RenderTargetContext->drawRect(noClip, paint, SkMatrix::I(), rect);
-    read_and_check_pixels(reporter, s32RenderTargetContext->asTexture().get(), expectedSRGB, error,
+    read_and_check_pixels(reporter, s32RenderTargetContext->asDeferredTexture().get(), expectedSRGB, error,
                           "re-render as sRGB");
 }
 #endif