From faa095e9842b924c20de84dce1bcc1adad7fe2e4 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 19 Dec 2017 13:15:02 -0500 Subject: Update SkSurface MakeFromBackend* factories to take an SkColorType. Bug: skia: Change-Id: Ib1b03b1181ec937843eac2e8d8cb03ebe53e32c1 Reviewed-on: https://skia-review.googlesource.com/86760 Commit-Queue: Greg Daniel Reviewed-by: Brian Salomon --- tools/fiddle/draw.cpp | 6 ++++-- tools/fiddle/fiddle_main.cpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'tools/fiddle') diff --git a/tools/fiddle/draw.cpp b/tools/fiddle/draw.cpp index 05866e316b..bbc463cdb0 100644 --- a/tools/fiddle/draw.cpp +++ b/tools/fiddle/draw.cpp @@ -33,6 +33,7 @@ void draw(SkCanvas* canvas) { sk_sp tmp = SkImage::MakeFromTexture(context, backEndTexture, kTopLeft_GrSurfaceOrigin, + kRGBA_8888_SkColorType, kOpaque_SkAlphaType, nullptr); @@ -40,13 +41,14 @@ void draw(SkCanvas* canvas) { sk_sp tmp2 = SkSurface::MakeFromBackendTexture(context, backEndTextureRenderTarget, kTopLeft_GrSurfaceOrigin, - 0, nullptr, nullptr); + 0, kRGBA_8888_SkColorType, + nullptr, nullptr); // Note: this surface should only be renderable (i.e., not textureable) sk_sp tmp3 = SkSurface::MakeFromBackendRenderTarget(context, backEndRenderTarget, kTopLeft_GrSurfaceOrigin, + kRGBA_8888_SkColorType, nullptr, nullptr); } - } diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp index 4c7a0878a2..b22ec55d03 100644 --- a/tools/fiddle/fiddle_main.cpp +++ b/tools/fiddle/fiddle_main.cpp @@ -129,6 +129,7 @@ static bool setup_backend_objects(GrContext* context, backingDesc.fOrigin = kTopLeft_GrSurfaceOrigin; backingDesc.fWidth = bm.width(); backingDesc.fHeight = bm.height(); + // This config must match the SkColorType used in draw.cpp in the SkImage and Surface factories backingDesc.fConfig = kRGBA_8888_GrPixelConfig; backingDesc.fSampleCnt = 0; -- cgit v1.2.3