From ed182d7c9020a0a533ada3e601183f34e4da7504 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 20 Mar 2017 11:03:55 -0400 Subject: Remove SkImage::MakeTextureFromPixmap Slight variation on https://skia-review.googlesource.com/c/7346/, which had to be reverted. This version also changes the non-mip upload path to use a GrTextureProxy. Hopefully this doesn't trigger the same perf regression that we saw last time. BUG=skia: Change-Id: Ic99bdd93904089942fb680c3af9c4c36310074c0 Reviewed-on: https://skia-review.googlesource.com/9892 Reviewed-by: Brian Salomon Commit-Queue: Brian Osman --- include/core/SkImage.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/core/SkImage.h b/include/core/SkImage.h index 7235580481..f50489771e 100644 --- a/include/core/SkImage.h +++ b/include/core/SkImage.h @@ -169,8 +169,6 @@ public: const SkMatrix*, const SkPaint*, BitDepth, sk_sp); - static sk_sp MakeTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted budgeted); - /////////////////////////////////////////////////////////////////////////////////////////////// int width() const { return fWidth; } -- cgit v1.2.3