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/GLProgramsTest.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/GLProgramsTest.cpp')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 9c39abce07..7628847a48 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -292,13 +292,13 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { dummyDesc.fWidth = 34; dummyDesc.fHeight = 18; sk_sp<GrTexture> dummyTexture1( - context->textureProvider()->createTexture(dummyDesc, SkBudgeted::kNo, nullptr, 0)); + context->resourceProvider()->createTexture(dummyDesc, SkBudgeted::kNo, nullptr, 0)); dummyDesc.fFlags = kNone_GrSurfaceFlags; dummyDesc.fConfig = kAlpha_8_GrPixelConfig; dummyDesc.fWidth = 16; dummyDesc.fHeight = 22; sk_sp<GrTexture> dummyTexture2( - context->textureProvider()->createTexture(dummyDesc, SkBudgeted::kNo, nullptr, 0)); + context->resourceProvider()->createTexture(dummyDesc, SkBudgeted::kNo, nullptr, 0)); if (!dummyTexture1 || ! dummyTexture2) { SkDebugf("Could not allocate dummy textures"); |