Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Unified Diff: src/gpu/effects/GrBezierEffect.h

Issue 617853003: Revert of Add isSingleComponent bool to getConstantColorComponent (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrProcessor.cpp ('k') | src/gpu/effects/GrBicubicEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrBezierEffect.h
diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/effects/GrBezierEffect.h
index 4631a2ca8e9176cc88f90ca0add1543ff83dc824..cb79ac39c5cf8fb98a1172a755787902a0c9fb50 100644
--- a/src/gpu/effects/GrBezierEffect.h
+++ b/src/gpu/effects/GrBezierEffect.h
@@ -97,17 +97,17 @@
typedef GrGLConicEffect GLProcessor;
+ virtual void getConstantColorComponents(GrColor* color,
+ uint32_t* validFlags) const SK_OVERRIDE {
+ *validFlags = 0;
+ }
+
virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE;
private:
GrConicEffect(GrPrimitiveEdgeType);
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
-
- virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE {
- inout->fValidFlags = 0;
- inout->fIsSingleComponent = false;
- }
GrPrimitiveEdgeType fEdgeType;
const GrShaderVar& fInConicCoeffs;
@@ -170,17 +170,17 @@
typedef GrGLQuadEffect GLProcessor;
+ virtual void getConstantColorComponents(GrColor* color,
+ uint32_t* validFlags) const SK_OVERRIDE {
+ *validFlags = 0;
+ }
+
virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE;
private:
GrQuadEffect(GrPrimitiveEdgeType);
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
-
- virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE {
- inout->fValidFlags = 0;
- inout->fIsSingleComponent = false;
- }
GrPrimitiveEdgeType fEdgeType;
const GrShaderVar& fInHairQuadEdge;
@@ -245,6 +245,11 @@
typedef GrGLCubicEffect GLProcessor;
+ virtual void getConstantColorComponents(GrColor* color,
+ uint32_t* validFlags) const SK_OVERRIDE {
+ *validFlags = 0;
+ }
+
virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE;
private:
@@ -252,11 +257,6 @@
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
- virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE {
- inout->fValidFlags = 0;
- inout->fIsSingleComponent = false;
- }
-
GrPrimitiveEdgeType fEdgeType;
const GrShaderVar& fInCubicCoeffs;
« no previous file with comments | « src/gpu/GrProcessor.cpp ('k') | src/gpu/effects/GrBicubicEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698