From 504ce5dc772e14be2f5697b00ac82fcf82127763 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Mon, 16 Nov 2015 11:02:05 -0800 Subject: Optionally pass rendertarget to getTestTarget This shouldn't really make any difference but allocating and holding on to a GrRenderTarget for each test target generates image differences for Mali GPUs. This CL allows an existing render target to be used for the test target. TBR=bsalomon@google.com Review URL: https://codereview.chromium.org/1447113002 --- gm/beziereffects.cpp | 12 ++++++------ gm/bigrrectaaeffect.cpp | 2 +- gm/constcolorprocessor.cpp | 2 +- gm/convexpolyeffect.cpp | 4 ++-- gm/rrects.cpp | 2 +- gm/texturedomaineffect.cpp | 2 +- gm/yuvtorgbeffect.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gm') diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 5313919994..58d7fef3d3 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -157,7 +157,7 @@ protected: SkAutoTUnref gp; { // scope to contain GrTestTarget GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { continue; } @@ -217,7 +217,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); SkASSERT(tt.target()); GrPipelineBuilder pipelineBuilder; @@ -305,7 +305,7 @@ protected: SkAutoTUnref gp; { // scope to contain GrTestTarget GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { continue; } @@ -362,7 +362,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); SkASSERT(tt.target()); GrPipelineBuilder pipelineBuilder; @@ -546,7 +546,7 @@ protected: SkAutoTUnref gp; { // scope to contain GrTestTarget GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { continue; } @@ -600,7 +600,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); SkASSERT(tt.target()); GrPipelineBuilder pipelineBuilder; diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp index bc0b56a72c..472910b5df 100644 --- a/gm/bigrrectaaeffect.cpp +++ b/gm/bigrrectaaeffect.cpp @@ -65,7 +65,7 @@ protected: canvas->save(); canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { SkDEBUGFAIL("Couldn't get Gr test target."); return; diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index 539119e040..3b2605e7a3 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -91,7 +91,7 @@ protected: SkRect renderRect = SkRect::MakeXYWH(0, 0, kRectSize, kRectSize); GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { SkDEBUGFAIL("Couldn't get Gr test target."); return; diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index de0b692a46..d35997b950 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -174,7 +174,7 @@ protected: for (int et = 0; et < kGrProcessorEdgeTypeCnt; ++et) { GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { SkDEBUGFAIL("Couldn't get Gr test target."); return; @@ -225,7 +225,7 @@ protected: for (int et = 0; et < kGrProcessorEdgeTypeCnt; ++et) { GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { SkDEBUGFAIL("Couldn't get Gr test target."); return; diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 279f4a6957..e48b8c8c8d 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -101,7 +101,7 @@ protected: if (kEffect_Type == fType) { #if SK_SUPPORT_GPU GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { SkDEBUGFAIL("Couldn't get Gr test target."); return; diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index cf772f5f1b..a2dc4b01b8 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -80,7 +80,7 @@ protected: } GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { SkDEBUGFAIL("Couldn't get Gr test target."); return; diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 25dca35e02..5f7cc1314d 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -78,7 +78,7 @@ protected: } GrTestTarget tt; - context->getTestTarget(&tt); + context->getTestTarget(&tt, rt); if (nullptr == tt.target()) { SkDEBUGFAIL("Couldn't get Gr test target."); return; -- cgit v1.2.3