From 587e08f361ee3e775a6bbc6dca761dbba82e422c Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 27 Jan 2017 10:59:27 -0500 Subject: Revert "Revert "Start of rewrite of GrFragmentProcessor optimizations."" This reverts commit 052fd5158f7f85e478a9f87c45fecaacf7d0f5f3. Disables the test (of unused code) until platform-specific issues are addressed. Change-Id: I7aa23a07954fccf382aa07d28afcbffb0bebcd6d Reviewed-on: https://skia-review.googlesource.com/7656 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- src/gpu/effects/GrConvexPolyEffect.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/gpu/effects/GrConvexPolyEffect.cpp') diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp index 65ed87b687..4100a0fce2 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/effects/GrConvexPolyEffect.cpp @@ -32,7 +32,7 @@ public: private: AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect) - : fRect(rect), fEdgeType(edgeType) { + : INHERITED(kModulatesInput_OptimizationFlag), fRect(rect), fEdgeType(edgeType) { this->initClassID(); } @@ -339,8 +339,7 @@ GrGLSLFragmentProcessor* GrConvexPolyEffect::onCreateGLSLInstance() const { } GrConvexPolyEffect::GrConvexPolyEffect(GrPrimitiveEdgeType edgeType, int n, const SkScalar edges[]) - : fEdgeType(edgeType) - , fEdgeCount(n) { + : INHERITED(kModulatesInput_OptimizationFlag), fEdgeType(edgeType), fEdgeCount(n) { this->initClassID(); // Factory function should have already ensured this. SkASSERT(n <= kMaxEdges); -- cgit v1.2.3