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/PackedConfigsTextureTest.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/PackedConfigsTextureTest.cpp')
| -rw-r--r-- | tests/PackedConfigsTextureTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp index c948bf9004..4b8e3cd6f0 100644 --- a/tests/PackedConfigsTextureTest.cpp +++ b/tests/PackedConfigsTextureTest.cpp @@ -15,8 +15,8 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrResourceProvider.h" #include "GrTexture.h" -#include "GrTextureProvider.h" static const int DEV_W = 10, DEV_H = 10; static const SkIRect DEV_RECT = SkIRect::MakeWH(DEV_W, DEV_H); @@ -117,7 +117,7 @@ void runTest(skiatest::Reporter* reporter, GrContext* context, desc.fConfig = config; desc.fOrigin = 0 == origin ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin; - sk_sp<GrTexture> fpTexture(context->textureProvider()->createTexture( + sk_sp<GrTexture> fpTexture(context->resourceProvider()->createTexture( desc, SkBudgeted::kNo, controlPixelData.begin(), 0)); SkASSERT(fpTexture); fpTexture->readPixels(0, 0, DEV_W, DEV_H, kRGBA_8888_GrPixelConfig, readBuffer.begin(), 0); |