From 296b1ccf9b8e9c8b945645efcbaa9c71c7135f58 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 15 Mar 2017 10:42:12 -0400 Subject: Retract GrContext from src/gpu/effects Change-Id: Iceb7263098286bafb2605ef17d1fe6bb25d71e97 Reviewed-on: https://skia-review.googlesource.com/9693 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- src/gpu/effects/GrBitmapTextGeoProc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp') diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 8283910494..527d5ce276 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -7,7 +7,6 @@ #include "GrBitmapTextGeoProc.h" -#include "GrContext.h" #include "GrTexture.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLGeometryProcessor.h" @@ -120,14 +119,14 @@ private: /////////////////////////////////////////////////////////////////////////////// -GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrContext* context, GrColor color, +GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrResourceProvider* resourceProvider, GrColor color, sk_sp proxy, const GrSamplerParams& params, GrMaskFormat format, const SkMatrix& localMatrix, bool usesLocalCoords) : fColor(color) , fLocalMatrix(localMatrix) , fUsesLocalCoords(usesLocalCoords) - , fTextureSampler(context->resourceProvider(), std::move(proxy), params) + , fTextureSampler(resourceProvider, std::move(proxy), params) , fInColor(nullptr) , fMaskFormat(format) { this->initClassID(); @@ -187,7 +186,8 @@ sk_sp GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* break; } - return GrBitmapTextGeoProc::Make(d->context(), GrRandomColor(d->fRandom), std::move(proxy), + return GrBitmapTextGeoProc::Make(d->resourceProvider(), GrRandomColor(d->fRandom), + std::move(proxy), params, format, GrTest::TestMatrix(d->fRandom), d->fRandom->nextBool()); } -- cgit v1.2.3