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/ReadWriteAlphaTest.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/ReadWriteAlphaTest.cpp')
-rw-r--r-- | tests/ReadWriteAlphaTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp index bfef33fa14..4fff156b98 100644 --- a/tests/ReadWriteAlphaTest.cpp +++ b/tests/ReadWriteAlphaTest.cpp @@ -12,9 +12,9 @@ #include "GrContext.h" #include "GrContextPriv.h" +#include "GrResourceProvider.h" #include "GrSurfaceContext.h" #include "GrSurfaceProxy.h" -#include "GrTextureProvider.h" #include "SkCanvas.h" #include "SkSurface.h" @@ -57,7 +57,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) { memset(alphaData, 0, X_SIZE * Y_SIZE); sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(*context->caps(), - context->textureProvider(), + context->resourceProvider(), desc, SkBudgeted::kNo, alphaData, 0)); @@ -161,7 +161,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) { } } sk_sp<GrTexture> texture( - context->textureProvider()->createTexture(desc, SkBudgeted::kNo, rgbaData, 0)); + context->resourceProvider()->createTexture(desc, SkBudgeted::kNo, rgbaData, 0)); if (!texture) { // We always expect to be able to create a RGBA texture if (!rt && kRGBA_8888_GrPixelConfig == desc.fConfig) { |