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

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

Issue 1127953003: Remove viewmatrix from GrGeometryProcessor base class (Closed) Base URL: https://skia.googlesource.com/skia.git@cleanup3
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: src/gpu/effects/GrDistanceFieldGeoProc.h
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h
index 92e48eecb834812fe3dc1ec51db468fef8206aff..ec661cedb8848254b22bf2c23efc29fa2038a84c 100644
--- a/src/gpu/effects/GrDistanceFieldGeoProc.h
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.h
@@ -69,6 +69,7 @@ public:
const Attribute* inColor() const { return fInColor; }
const Attribute* inTextureCoords() const { return fInTextureCoords; }
GrColor color() const { return fColor; }
+ const SkMatrix& viewMatrix() const { return fViewMatrix; }
#ifdef SK_GAMMA_APPLY_TO_A8
float getDistanceAdjust() const { return fDistanceAdjust; }
#endif
@@ -92,6 +93,7 @@ private:
uint32_t flags);
GrColor fColor;
robertphillips 2015/05/14 16:35:24 const ?
+ SkMatrix fViewMatrix;
GrTextureAccess fTextureAccess;
#ifdef SK_GAMMA_APPLY_TO_A8
float fDistanceAdjust;
@@ -129,6 +131,7 @@ public:
const Attribute* inColor() const { return fInColor; }
const Attribute* inTextureCoords() const { return fInTextureCoords; }
GrColor color() const { return fColor; }
+ const SkMatrix& viewMatrix() const { return fViewMatrix; }
uint32_t getFlags() const { return fFlags; }
virtual void getGLProcessorKey(const GrBatchTracker& bt,
@@ -145,6 +148,7 @@ private:
const GrTextureParams& params, uint32_t flags);
GrColor fColor;
robertphillips 2015/05/14 16:35:24 const ?
+ SkMatrix fViewMatrix;
GrTextureAccess fTextureAccess;
uint32_t fFlags;
const Attribute* fInPosition;
@@ -194,6 +198,7 @@ public:
const Attribute* inTextureCoords() const { return fInTextureCoords; }
DistanceAdjust getDistanceAdjust() const { return fDistanceAdjust; }
GrColor color() const { return fColor; }
+ const SkMatrix& viewMatrix() const { return fViewMatrix; }
uint32_t getFlags() const { return fFlags; }
virtual void getGLProcessorKey(const GrBatchTracker& bt,
@@ -211,6 +216,7 @@ private:
DistanceAdjust wa, uint32_t flags);
GrColor fColor;
robertphillips 2015/05/14 16:35:24 const ?
+ SkMatrix fViewMatrix;
GrTextureAccess fTextureAccess;
DistanceAdjust fDistanceAdjust;
uint32_t fFlags;

Powered by Google App Engine
This is Rietveld 408576698