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/CopySurfaceTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/CopySurfaceTest.cpp') diff --git a/tests/CopySurfaceTest.cpp b/tests/CopySurfaceTest.cpp index e1765d5809..828eff073e 100644 --- a/tests/CopySurfaceTest.cpp +++ b/tests/CopySurfaceTest.cpp @@ -11,10 +11,10 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrContextPriv.h" +#include "GrResourceProvider.h" #include "GrSurfaceContext.h" #include "GrSurfaceProxy.h" #include "GrTexture.h" -#include "GrTextureProvider.h" #include "SkUtils.h" @@ -75,14 +75,14 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(CopySurface, reporter, ctxInfo) { sk_sp src(GrSurfaceProxy::MakeDeferred( *context->caps(), - context->textureProvider(), + context->resourceProvider(), srcDesc, SkBudgeted::kNo, srcPixels.get(), kRowBytes)); sk_sp dst(GrSurfaceProxy::MakeDeferred( *context->caps(), - context->textureProvider(), + context->resourceProvider(), dstDesc, SkBudgeted::kNo, dstPixels.get(), kRowBytes)); -- cgit v1.2.3