diff options
author | Brian Osman <brianosman@google.com> | 2017-03-04 08:12:46 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-04 13:49:47 +0000 |
commit | 32342f032e1dfd133040324f851f0365f9d4cb51 (patch) | |
tree | 56cc2ae886ef068ff0ebb13a22c9357b40cdc6dd /tests/CopySurfaceTest.cpp | |
parent | ae9718f1d40556ed5a49e616dbe54087f4d0d546 (diff) |
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 <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/CopySurfaceTest.cpp')
-rw-r--r-- | tests/CopySurfaceTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<GrTextureProxy> src(GrSurfaceProxy::MakeDeferred( *context->caps(), - context->textureProvider(), + context->resourceProvider(), srcDesc, SkBudgeted::kNo, srcPixels.get(), kRowBytes)); sk_sp<GrTextureProxy> dst(GrSurfaceProxy::MakeDeferred( *context->caps(), - context->textureProvider(), + context->resourceProvider(), dstDesc, SkBudgeted::kNo, dstPixels.get(), kRowBytes)); |