From a2192a76b55e465a8a97badd473a24d7daeac7a2 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 18 Dec 2017 11:12:48 -0500 Subject: point deferredtextureimage GMs at resources/images Change-Id: If2f75023831d0992bd0e8429d36fd3f40a04b2a0 Reviewed-on: https://skia-review.googlesource.com/86600 Reviewed-by: Hal Canary Commit-Queue: Mike Klein --- gm/deferredtextureimage.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gm') diff --git a/gm/deferredtextureimage.cpp b/gm/deferredtextureimage.cpp index b034a4ef15..00953b1e2f 100644 --- a/gm/deferredtextureimage.cpp +++ b/gm/deferredtextureimage.cpp @@ -148,23 +148,23 @@ static void DrawDeferredTextureImageMipMapTree(SkCanvas* canvas, SkImage* image, DEF_SIMPLE_GM(deferred_texture_image_none, canvas, 512 + 512 + 30, 512 + 20) { auto params = SkImage::DeferredTextureImageUsageParams(SkMatrix::MakeScale(1.f, 1.f), kNone_SkFilterQuality, 0); - DrawDeferredTextureImageData(canvas, "mandrill_512.png", ¶ms, kN32_SkColorType); + DrawDeferredTextureImageData(canvas, "images/mandrill_512.png", ¶ms, kN32_SkColorType); } DEF_SIMPLE_GM(deferred_texture_image_low, canvas, 512 + 512 + 30, 512 + 20) { auto params = SkImage::DeferredTextureImageUsageParams(SkMatrix::MakeScale(1.f, 1.f), kLow_SkFilterQuality, 0); - DrawDeferredTextureImageData(canvas, "mandrill_512.png", ¶ms, kN32_SkColorType); + DrawDeferredTextureImageData(canvas, "images/mandrill_512.png", ¶ms, kN32_SkColorType); } DEF_SIMPLE_GM(deferred_texture_image_low_dithered, canvas, 180 + 180 + 30, 180 + 20) { auto params = SkImage::DeferredTextureImageUsageParams(SkMatrix::MakeScale(0.25f, 0.25f), kLow_SkFilterQuality, 0); - DrawDeferredTextureImageData(canvas, "dog.jpg", ¶ms, kARGB_4444_SkColorType); + DrawDeferredTextureImageData(canvas, "images/dog.jpg", ¶ms, kARGB_4444_SkColorType); } DEF_SIMPLE_GM(deferred_texture_image_medium_encoded, canvas, 512 + 512 + 30, 1110) { - sk_sp encodedImage = GetResourceAsImage("mandrill_512.png"); + sk_sp encodedImage = GetResourceAsImage("images/mandrill_512.png"); if (!encodedImage) { SkDebugf("\nCould not load resource.\n"); return; @@ -177,7 +177,7 @@ DEF_SIMPLE_GM(deferred_texture_image_medium_encoded, canvas, 512 + 512 + 30, 111 DEF_SIMPLE_GM(deferred_texture_image_medium_decoded, canvas, 512 + 512 + 30, 1110) { SkBitmap bitmap; - if (!GetResourceAsBitmap("mandrill_512.png", &bitmap)) { + if (!GetResourceAsBitmap("images/mandrill_512.png", &bitmap)) { SkDebugf("\nCould not decode resource.\n"); return; } @@ -191,11 +191,11 @@ DEF_SIMPLE_GM(deferred_texture_image_medium_decoded, canvas, 512 + 512 + 30, 111 DEF_SIMPLE_GM(deferred_texture_image_high, canvas, 512 + 512 + 30, 512 + 20) { auto params = SkImage::DeferredTextureImageUsageParams(SkMatrix::MakeScale(1.f, 1.f), kHigh_SkFilterQuality, 0); - DrawDeferredTextureImageData(canvas, "mandrill_512.png", ¶ms, kN32_SkColorType); + DrawDeferredTextureImageData(canvas, "images/mandrill_512.png", ¶ms, kN32_SkColorType); } DEF_SIMPLE_GM(deferred_texture_image_medium_encoded_indexed, canvas, 128 + 128 + 30, 340) { - sk_sp encodedImage = GetResourceAsImage("color_wheel.gif"); + sk_sp encodedImage = GetResourceAsImage("images/color_wheel.gif"); if (!encodedImage) { SkDebugf("\nCould not load resource.\n"); return; @@ -208,7 +208,7 @@ DEF_SIMPLE_GM(deferred_texture_image_medium_encoded_indexed, canvas, 128 + 128 + DEF_SIMPLE_GM(deferred_texture_image_medium_decoded_indexed, canvas, 128 + 128 + 30, 340) { SkBitmap bitmap; - if (!GetResourceAsBitmap("color_wheel.gif", &bitmap)) { + if (!GetResourceAsBitmap("images/color_wheel.gif", &bitmap)) { SkDebugf("\nCould not decode resource.\n"); return; } -- cgit v1.2.3