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/GrBlurUtils.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/GrBlurUtils.cpp')
-rw-r--r-- | src/gpu/GrBlurUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp index 091d7766ba..6716fdec77 100644 --- a/src/gpu/GrBlurUtils.cpp +++ b/src/gpu/GrBlurUtils.cpp @@ -12,11 +12,11 @@ #include "GrContextPriv.h" #include "GrFixedClip.h" #include "GrRenderTargetContextPriv.h" +#include "GrResourceProvider.h" #include "effects/GrSimpleTextureEffect.h" #include "GrStyle.h" #include "GrTexture.h" #include "GrTextureProxy.h" -#include "GrTextureProvider.h" #include "SkDraw.h" #include "SkGrPriv.h" #include "SkMaskFilter.h" @@ -207,7 +207,7 @@ static void draw_path_with_mask_filter(GrContext* context, return; } - if (maskFilter->directFilterMaskGPU(context->textureProvider(), + if (maskFilter->directFilterMaskGPU(context->resourceProvider(), renderTargetContext, std::move(paint), clip, |