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 /src/gpu/GrBitmapTextureMaker.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 'src/gpu/GrBitmapTextureMaker.cpp')
-rw-r--r-- | src/gpu/GrBitmapTextureMaker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp index cff052fa53..24cb05f937 100644 --- a/src/gpu/GrBitmapTextureMaker.cpp +++ b/src/gpu/GrBitmapTextureMaker.cpp @@ -9,7 +9,7 @@ #include "GrContext.h" #include "GrGpuResourcePriv.h" -#include "GrTextureProvider.h" +#include "GrResourceProvider.h" #include "SkBitmap.h" #include "SkGrPriv.h" #include "SkPixelRef.h" @@ -32,7 +32,7 @@ GrTexture* GrBitmapTextureMaker::refOriginalTexture(bool willBeMipped, GrTexture* tex = nullptr; if (fOriginalKey.isValid()) { - tex = this->context()->textureProvider()->findAndRefTextureByUniqueKey(fOriginalKey); + tex = this->context()->resourceProvider()->findAndRefTextureByUniqueKey(fOriginalKey); if (tex) { return tex; } @@ -44,7 +44,7 @@ GrTexture* GrBitmapTextureMaker::refOriginalTexture(bool willBeMipped, tex = GrUploadBitmapToTexture(this->context(), fBitmap); } if (tex && fOriginalKey.isValid()) { - this->context()->textureProvider()->assignUniqueKeyToTexture(fOriginalKey, tex); + this->context()->resourceProvider()->assignUniqueKeyToTexture(fOriginalKey, tex); GrInstallBitmapUniqueKeyInvalidator(fOriginalKey, fBitmap.pixelRef()); } return tex; |