From 26bea5d55735367152378bae14453e9666d1c625 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 5 Oct 2016 10:36:38 -0400 Subject: Make test lower-level, make const_cast more visible. I can only think there's something funky going on with the hidden const_cast inside SkRasterPipeline.cpp, or with the Sk4h -> Sk4f conversion. So make the const_cast visible and write the test directly in halfs instead of floats. CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN-Trybot BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3003 Change-Id: I3a7e19ae165fce44f177b4968a63ec04e25c4b93 Reviewed-on: https://skia-review.googlesource.com/3003 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- src/core/SkRasterPipeline.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core/SkRasterPipeline.h') diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h index 785a118ad8..996c7838e3 100644 --- a/src/core/SkRasterPipeline.h +++ b/src/core/SkRasterPipeline.h @@ -131,7 +131,8 @@ public: kNumStockStages, }; - void append(StockStage, const void* ctx=nullptr); + void append(StockStage, void* = nullptr); + void append(StockStage stage, const void* ctx) { this->append(stage, const_cast(ctx)); } // Append all stages to this pipeline. @@ -140,7 +141,7 @@ public: private: using Stages = SkSTArray<10, Stage, /*MEM_COPY=*/true>; - void append(Fn body, Fn tail, const void*); + void append(Fn body, Fn tail, void*); // This no-op default makes fBodyStart and fTailStart unconditionally safe to call, // and is always the last stage's fNext as a sort of safety net to make sure even a -- cgit v1.2.3