From ff0ca5ed825d9106edc2df6ab3865e1c17c326bf Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 22 Jul 2015 11:54:44 -0700 Subject: Misc cleanup This is split off of https://codereview.chromium.org/1225923010/ (Start tightening correspondence betweeen GrDrawContext and GrRenderTarget). It: fixes some style nits replaces some passing of GrContext with GrTextureProvider & GrDrawContext does a bit of the finer grained creation of GrDrawContexts Review URL: https://codereview.chromium.org/1245183002 --- src/gpu/effects/GrConfigConversionEffect.cpp | 62 +++++++++++++++++----------- 1 file changed, 39 insertions(+), 23 deletions(-) (limited to 'src/gpu/effects/GrConfigConversionEffect.cpp') diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index fa97f324be..82ac5df081 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -207,11 +207,6 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context bool failed = true; - GrDrawContext* drawContext = context->drawContext(); - if (!drawContext) { - return; - } - for (size_t i = 0; i < SK_ARRAY_COUNT(kConversionRules) && failed; ++i) { *pmToUPMRule = kConversionRules[i][0]; *upmToPMRule = kConversionRules[i][1]; @@ -239,30 +234,51 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context SkMatrix::I()))); paint1.addColorProcessor(pmToUPM1); - drawContext->drawNonAARectToRect(readTex->asRenderTarget(), - GrClip::WideOpen(), - paint1, - SkMatrix::I(), - kDstRect, - kSrcRect); + + + GrDrawContext* readDrawContext = context->drawContext(); + if (!readDrawContext) { + failed = true; + break; + } + + readDrawContext->drawNonAARectToRect(readTex->asRenderTarget(), + GrClip::WideOpen(), + paint1, + SkMatrix::I(), + kDstRect, + kSrcRect); readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, firstRead); paint2.addColorProcessor(upmToPM); - drawContext->drawNonAARectToRect(tempTex->asRenderTarget(), - GrClip::WideOpen(), - paint2, - SkMatrix::I(), - kDstRect, - kSrcRect); + + GrDrawContext* tempDrawContext = context->drawContext(); + if (!tempDrawContext) { + failed = true; + break; + } + tempDrawContext->drawNonAARectToRect(tempTex->asRenderTarget(), + GrClip::WideOpen(), + paint2, + SkMatrix::I(), + kDstRect, + kSrcRect); paint3.addColorProcessor(pmToUPM2); - drawContext->drawNonAARectToRect(readTex->asRenderTarget(), - GrClip::WideOpen(), - paint3, - SkMatrix::I(), - kDstRect, - kSrcRect); + + readDrawContext = context->drawContext(); + if (!readDrawContext) { + failed = true; + break; + } + + readDrawContext->drawNonAARectToRect(readTex->asRenderTarget(), + GrClip::WideOpen(), + paint3, + SkMatrix::I(), + kDstRect, + kSrcRect); readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, secondRead); -- cgit v1.2.3