diff options
author | 2015-02-25 13:19:48 -0800 | |
---|---|---|
committer | 2015-02-25 13:19:48 -0800 | |
commit | 570d2f81a65fc868d6300a7edf34c0d5d048c5d6 (patch) | |
tree | 1e0801033607b4245ab407d05fb42dc07e037fb0 /src/gpu/SkGr.cpp | |
parent | 2907059d0eb1972a300ea1bf0cd4e4febabb9784 (diff) |
I'd really like to land this before the branch so speedy reviews are appreciated.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/586d5d640b19860dfbbd903a5188da1bbbe87336
Review URL: https://codereview.chromium.org/936943002
Diffstat (limited to 'src/gpu/SkGr.cpp')
-rw-r--r-- | src/gpu/SkGr.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index d069fe0434..b0814af1de 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -243,9 +243,8 @@ GrTexture* stretch_texture_to_next_pot(GrTexture* inputTexture, Stretch stretch, SkRect rect = SkRect::MakeWH(SkIntToScalar(rtDesc.fWidth), SkIntToScalar(rtDesc.fHeight)); SkRect localRect = SkRect::MakeWH(1.f, 1.f); - GrContext::AutoClip ac(context, GrContext::AutoClip::kWideOpen_InitialClip); - context->drawNonAARectToRect(stretched->asRenderTarget(), paint, SkMatrix::I(), rect, - localRect); + context->drawNonAARectToRect(stretched->asRenderTarget(), GrClip::WideOpen(), paint, + SkMatrix::I(), rect, localRect); return stretched; } @@ -392,8 +391,8 @@ static GrTexture* load_yuv_texture(GrContext* ctx, const GrUniqueKey& optionalKe paint.addColorProcessor(yuvToRgbProcessor); SkRect r = SkRect::MakeWH(SkIntToScalar(yuvInfo.fSize[0].fWidth), SkIntToScalar(yuvInfo.fSize[0].fHeight)); - GrContext::AutoClip ac(ctx, GrContext::AutoClip::kWideOpen_InitialClip); - ctx->drawRect(renderTarget, paint, SkMatrix::I(), r); + + ctx->drawRect(renderTarget, GrClip::WideOpen(), paint, SkMatrix::I(), r); return result; } @@ -706,8 +705,6 @@ void SkPaint2GrPaintShader(GrContext* context, GrRenderTarget* rt, const SkPaint // asFragmentProcessor(). Since these calls get passed back to the client, we don't really // want them messing around with the context. { - GrContext::AutoClip ac(context, GrContext::AutoClip::kWideOpen_InitialClip); - // Allow the shader to modify paintColor and also create an effect to be installed as // the first color effect on the GrPaint. GrFragmentProcessor* fp = NULL; |