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

Side by Side Diff: src/gpu/effects/GrBezierEffect.h

Issue 1131513005: remove localmatrix from GrGeometryProcessor base class (Closed) Base URL: https://skia.googlesource.com/skia.git@cleanup4
Patch Set: tweaks Created 5 years, 7 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 unified diff | Download patch
« no previous file with comments | « src/gpu/GrPrimitiveProcessor.h ('k') | src/gpu/effects/GrBezierEffect.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef GrBezierEffect_DEFINED 8 #ifndef GrBezierEffect_DEFINED
9 #define GrBezierEffect_DEFINED 9 #define GrBezierEffect_DEFINED
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 const char* name() const override { return "Conic"; } 93 const char* name() const override { return "Conic"; }
94 94
95 inline const Attribute* inPosition() const { return fInPosition; } 95 inline const Attribute* inPosition() const { return fInPosition; }
96 inline const Attribute* inConicCoeffs() const { return fInConicCoeffs; } 96 inline const Attribute* inConicCoeffs() const { return fInConicCoeffs; }
97 inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType ); } 97 inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType ); }
98 inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); } 98 inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
99 inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } 99 inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
100 GrColor color() const { return fColor; } 100 GrColor color() const { return fColor; }
101 const SkMatrix& viewMatrix() const { return fViewMatrix; } 101 const SkMatrix& viewMatrix() const { return fViewMatrix; }
102 const SkMatrix& localMatrix() const { return fLocalMatrix; }
102 103
103 virtual void getGLProcessorKey(const GrBatchTracker& bt, 104 virtual void getGLProcessorKey(const GrBatchTracker& bt,
104 const GrGLSLCaps& caps, 105 const GrGLSLCaps& caps,
105 GrProcessorKeyBuilder* b) const override; 106 GrProcessorKeyBuilder* b) const override;
106 107
107 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, 108 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
108 const GrGLSLCaps&) const ov erride; 109 const GrGLSLCaps&) const ov erride;
109 110
110 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override ; 111 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override ;
111 112
112 private: 113 private:
113 GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimi tiveEdgeType, 114 GrConicEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimi tiveEdgeType,
114 const SkMatrix& localMatrix); 115 const SkMatrix& localMatrix);
115 116
116 GrColor fColor; 117 GrColor fColor;
117 SkMatrix fViewMatrix; 118 SkMatrix fViewMatrix;
119 SkMatrix fLocalMatrix;
118 uint8_t fCoverageScale; 120 uint8_t fCoverageScale;
119 GrPrimitiveEdgeType fEdgeType; 121 GrPrimitiveEdgeType fEdgeType;
120 const Attribute* fInPosition; 122 const Attribute* fInPosition;
121 const Attribute* fInConicCoeffs; 123 const Attribute* fInConicCoeffs;
122 124
123 GR_DECLARE_GEOMETRY_PROCESSOR_TEST; 125 GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
124 126
125 typedef GrGeometryProcessor INHERITED; 127 typedef GrGeometryProcessor INHERITED;
126 }; 128 };
127 129
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 174
173 const char* name() const override { return "Quad"; } 175 const char* name() const override { return "Quad"; }
174 176
175 inline const Attribute* inPosition() const { return fInPosition; } 177 inline const Attribute* inPosition() const { return fInPosition; }
176 inline const Attribute* inHairQuadEdge() const { return fInHairQuadEdge; } 178 inline const Attribute* inHairQuadEdge() const { return fInHairQuadEdge; }
177 inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType ); } 179 inline bool isAntiAliased() const { return GrProcessorEdgeTypeIsAA(fEdgeType ); }
178 inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); } 180 inline bool isFilled() const { return GrProcessorEdgeTypeIsFill(fEdgeType); }
179 inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; } 181 inline GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
180 GrColor color() const { return fColor; } 182 GrColor color() const { return fColor; }
181 const SkMatrix& viewMatrix() const { return fViewMatrix; } 183 const SkMatrix& viewMatrix() const { return fViewMatrix; }
184 const SkMatrix& localMatrix() const { return fLocalMatrix; }
182 185
183 virtual void getGLProcessorKey(const GrBatchTracker& bt, 186 virtual void getGLProcessorKey(const GrBatchTracker& bt,
184 const GrGLSLCaps& caps, 187 const GrGLSLCaps& caps,
185 GrProcessorKeyBuilder* b) const override; 188 GrProcessorKeyBuilder* b) const override;
186 189
187 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, 190 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
188 const GrGLSLCaps&) const ov erride; 191 const GrGLSLCaps&) const ov erride;
189 192
190 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override ; 193 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override ;
191 194
192 private: 195 private:
193 GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimit iveEdgeType, 196 GrQuadEffect(GrColor, const SkMatrix& viewMatrix, uint8_t coverage, GrPrimit iveEdgeType,
194 const SkMatrix& localMatrix); 197 const SkMatrix& localMatrix);
195 198
196 GrColor fColor; 199 GrColor fColor;
197 SkMatrix fViewMatrix; 200 SkMatrix fViewMatrix;
201 SkMatrix fLocalMatrix;
198 uint8_t fCoverageScale; 202 uint8_t fCoverageScale;
199 GrPrimitiveEdgeType fEdgeType; 203 GrPrimitiveEdgeType fEdgeType;
200 const Attribute* fInPosition; 204 const Attribute* fInPosition;
201 const Attribute* fInHairQuadEdge; 205 const Attribute* fInHairQuadEdge;
202 206
203 GR_DECLARE_GEOMETRY_PROCESSOR_TEST; 207 GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
204 208
205 typedef GrGeometryProcessor INHERITED; 209 typedef GrGeometryProcessor INHERITED;
206 }; 210 };
207 211
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 GrPrimitiveEdgeType fEdgeType; 277 GrPrimitiveEdgeType fEdgeType;
274 const Attribute* fInPosition; 278 const Attribute* fInPosition;
275 const Attribute* fInCubicCoeffs; 279 const Attribute* fInCubicCoeffs;
276 280
277 GR_DECLARE_GEOMETRY_PROCESSOR_TEST; 281 GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
278 282
279 typedef GrGeometryProcessor INHERITED; 283 typedef GrGeometryProcessor INHERITED;
280 }; 284 };
281 285
282 #endif 286 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrPrimitiveProcessor.h ('k') | src/gpu/effects/GrBezierEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698