From 32342f032e1dfd133040324f851f0365f9d4cb51 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Sat, 4 Mar 2017 08:12:46 -0500 Subject: Rebase and fix chromium Combine texture provider and resource provider Largely mechanical. Only three places that were calling createApprox via texture provider (ie without flags), so that was simple. BUG=skia: Change-Id: I876367bcdc6a8db736deedab1028de1972015509 Reviewed-on: https://skia-review.googlesource.com/9176 Commit-Queue: Brian Osman Reviewed-by: Brian Salomon --- tests/ReadPixelsTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/ReadPixelsTest.cpp') diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index 214215419e..774f0af06a 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -16,7 +16,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" -#include "GrTextureProvider.h" +#include "GrResourceProvider.h" #include "SkGr.h" #endif @@ -481,7 +481,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadPixels_Texture, reporter, ctxInfo) { desc.fHeight = DEV_H; desc.fConfig = kSkia8888_GrPixelConfig; desc.fOrigin = origin; - sk_sp texture(ctxInfo.grContext()->textureProvider()->createTexture(desc, + sk_sp texture(ctxInfo.grContext()->resourceProvider()->createTexture(desc, SkBudgeted::kNo)); test_readpixels_texture(reporter, texture.get()); } -- cgit v1.2.3