From d3ccb0a37f0e62c84fdcd6a77b7b15476b04db7a Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 3 Apr 2017 10:38:00 -0400 Subject: Move pipeline handling out of GrMeshDrawOp. The monolithic GrPipeline is moved to a subclass GrLegacyDrawMeshOp. The pipeline used to record a GrMesh draw in a GrMeshDrawOp must now be passed rather than implicitly using the op's pipeline. Change-Id: I50d77e4dcc8d91a523fa7566ce43a9a291174706 Reviewed-on: https://skia-review.googlesource.com/11002 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- tests/GLProgramsTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/GLProgramsTest.cpp') diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 125f5d064c..489aec1391 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -323,7 +323,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { GrPaint grPaint; - std::unique_ptr op(GrRandomDrawOp(&random, context)); + std::unique_ptr op(GrRandomDrawOp(&random, context)); SkASSERT(op); GrProcessorTestData ptd(&random, context, renderTargetContext.get(), dummyTextures); @@ -336,8 +336,8 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { static constexpr GrAAType kAATypes[] = {GrAAType::kNone, GrAAType::kCoverage}; GrAAType aaType = kAATypes[random.nextULessThan(SK_ARRAY_COUNT(kAATypes))]; - renderTargetContext->priv().testingOnly_addMeshDrawOp(std::move(grPaint), aaType, - std::move(op), uss, snapToCenters); + renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( + std::move(grPaint), aaType, std::move(op), uss, snapToCenters); } // Flush everything, test passes if flush is successful(ie, no asserts are hit, no crashes) drawingManager->flush(nullptr); @@ -358,7 +358,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { for (int i = 0; i < fpFactoryCnt; ++i) { // Since FP factories internally randomize, call each 10 times. for (int j = 0; j < 10; ++j) { - std::unique_ptr op(GrRandomDrawOp(&random, context)); + std::unique_ptr op(GrRandomDrawOp(&random, context)); SkASSERT(op); GrProcessorTestData ptd(&random, context, renderTargetContext.get(), dummyTextures); GrPaint grPaint; @@ -370,7 +370,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { BlockInputFragmentProcessor::Make(std::move(fp))); grPaint.addColorFragmentProcessor(std::move(blockFP)); - renderTargetContext->priv().testingOnly_addMeshDrawOp( + renderTargetContext->priv().testingOnly_addLegacyMeshDrawOp( std::move(grPaint), GrAAType::kNone, std::move(op)); drawingManager->flush(nullptr); } -- cgit v1.2.3