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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/gpu/effects/GrDashingEffect.cpp

Issue 1332923003: Remove batchtracker (Closed) Base URL: https://skia.googlesource.com/skia.git@latecreatepathprocessor
Patch Set: tweaks Created 5 years, 3 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
« src/gpu/effects/GrBitmapTextGeoProc.cpp ('K') | « src/gpu/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrDistanceFieldGeoProc.h » ('j') | src/gpu/effects/GrDistanceFieldGeoProc.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrDashingEffect.cpp
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
index 5420dbd167c250a04a7b6d0c03a42fa48c2e6222..a2b2802bd89c9bcf0dce9240d43ea677821af795 100644
--- a/src/gpu/effects/GrDashingEffect.cpp
+++ b/src/gpu/effects/GrDashingEffect.cpp
@@ -784,12 +784,10 @@ public:
bool usesLocalCoords() const { return fUsesLocalCoords; }
- virtual void getGLProcessorKey(const GrBatchTracker&,
- const GrGLSLCaps&,
+ virtual void getGLProcessorKey(const GrGLSLCaps&,
bsalomon 2015/09/10 18:55:31 one line? -virtual?
joshualitt 2015/09/10 20:08:05 Acknowledged.
GrProcessorKeyBuilder* b) const override;
- virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker&,
- const GrGLSLCaps&) const override;
+ virtual GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override;
bsalomon 2015/09/10 18:55:31 -virtual?
joshualitt 2015/09/10 20:08:06 Acknowledged.
private:
DashingCircleEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix,
@@ -812,18 +810,16 @@ private:
class GLDashingCircleEffect : public GrGLGeometryProcessor {
public:
- GLDashingCircleEffect(const GrGeometryProcessor&, const GrBatchTracker&);
+ GLDashingCircleEffect();
void onEmitCode(EmitArgs&, GrGPArgs*) override;
static inline void GenKey(const GrGeometryProcessor&,
- const GrBatchTracker&,
const GrGLSLCaps&,
GrProcessorKeyBuilder*);
virtual void setData(const GrGLProgramDataManager&,
- const GrPrimitiveProcessor&,
- const GrBatchTracker&) override;
+ const GrPrimitiveProcessor&) override;
bsalomon 2015/09/10 18:55:31 one line? -virtual?
joshualitt 2015/09/10 20:08:05 Acknowledged.
void setTransformData(const GrPrimitiveProcessor& primProc,
const GrGLProgramDataManager& pdman,
@@ -842,8 +838,7 @@ private:
typedef GrGLGeometryProcessor INHERITED;
};
-GLDashingCircleEffect::GLDashingCircleEffect(const GrGeometryProcessor&,
- const GrBatchTracker&) {
+GLDashingCircleEffect::GLDashingCircleEffect() {
fColor = GrColor_ILLEGAL;
fPrevRadius = SK_ScalarMin;
fPrevCenterX = SK_ScalarMin;
@@ -900,8 +895,7 @@ void GLDashingCircleEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
}
void GLDashingCircleEffect::setData(const GrGLProgramDataManager& pdman,
- const GrPrimitiveProcessor& processor,
- const GrBatchTracker& bt) {
+ const GrPrimitiveProcessor& processor) {
const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>();
if (dce.color() != fColor) {
GrGLfloat c[4];
@@ -912,7 +906,6 @@ void GLDashingCircleEffect::setData(const GrGLProgramDataManager& pdman,
}
void GLDashingCircleEffect::GenKey(const GrGeometryProcessor& gp,
- const GrBatchTracker& bt,
const GrGLSLCaps&,
GrProcessorKeyBuilder* b) {
const DashingCircleEffect& dce = gp.cast<DashingCircleEffect>();
@@ -932,15 +925,13 @@ GrGeometryProcessor* DashingCircleEffect::Create(GrColor color,
return new DashingCircleEffect(color, aaMode, localMatrix, usesLocalCoords);
}
-void DashingCircleEffect::getGLProcessorKey(const GrBatchTracker& bt,
- const GrGLSLCaps& caps,
+void DashingCircleEffect::getGLProcessorKey(const GrGLSLCaps& caps,
bsalomon 2015/09/10 18:55:31 one line?
GrProcessorKeyBuilder* b) const {
- GLDashingCircleEffect::GenKey(*this, bt, caps, b);
+ GLDashingCircleEffect::GenKey(*this, caps, b);
}
-GrGLPrimitiveProcessor* DashingCircleEffect::createGLInstance(const GrBatchTracker& bt,
- const GrGLSLCaps&) const {
- return new GLDashingCircleEffect(*this, bt);
+GrGLPrimitiveProcessor* DashingCircleEffect::createGLInstance(const GrGLSLCaps&) const {
+ return new GLDashingCircleEffect();
}
DashingCircleEffect::DashingCircleEffect(GrColor color,
@@ -1007,12 +998,10 @@ public:
bool usesLocalCoords() const { return fUsesLocalCoords; }
- virtual void getGLProcessorKey(const GrBatchTracker& bt,
- const GrGLSLCaps& caps,
+ virtual void getGLProcessorKey(const GrGLSLCaps& caps,
bsalomon 2015/09/10 18:55:31 one line? -virtual?
joshualitt 2015/09/10 20:08:05 Acknowledged.
GrProcessorKeyBuilder* b) const override;
- virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
- const GrGLSLCaps&) const override;
+ virtual GrGLPrimitiveProcessor* createGLInstance(const GrGLSLCaps&) const override;
bsalomon 2015/09/10 18:55:31 one line?
joshualitt 2015/09/10 20:08:05 Acknowledged.
private:
DashingLineEffect(GrColor, DashAAMode aaMode, const SkMatrix& localMatrix,
@@ -1035,18 +1024,16 @@ private:
class GLDashingLineEffect : public GrGLGeometryProcessor {
public:
- GLDashingLineEffect(const GrGeometryProcessor&, const GrBatchTracker&);
+ GLDashingLineEffect();
void onEmitCode(EmitArgs&, GrGPArgs*) override;
static inline void GenKey(const GrGeometryProcessor&,
- const GrBatchTracker&,
const GrGLSLCaps&,
GrProcessorKeyBuilder*);
virtual void setData(const GrGLProgramDataManager&,
bsalomon 2015/09/10 18:55:31 one line? -virtual?
joshualitt 2015/09/10 20:08:06 Acknowledged.
- const GrPrimitiveProcessor&,
- const GrBatchTracker&) override;
+ const GrPrimitiveProcessor&) override;
void setTransformData(const GrPrimitiveProcessor& primProc,
const GrGLProgramDataManager& pdman,
@@ -1061,8 +1048,7 @@ private:
typedef GrGLGeometryProcessor INHERITED;
};
-GLDashingLineEffect::GLDashingLineEffect(const GrGeometryProcessor&,
- const GrBatchTracker&) {
+GLDashingLineEffect::GLDashingLineEffect() {
fColor = GrColor_ILLEGAL;
}
@@ -1136,8 +1122,7 @@ void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
}
void GLDashingLineEffect::setData(const GrGLProgramDataManager& pdman,
- const GrPrimitiveProcessor& processor,
- const GrBatchTracker& bt) {
+ const GrPrimitiveProcessor& processor) {
const DashingLineEffect& de = processor.cast<DashingLineEffect>();
if (de.color() != fColor) {
GrGLfloat c[4];
@@ -1148,7 +1133,6 @@ void GLDashingLineEffect::setData(const GrGLProgramDataManager& pdman,
}
void GLDashingLineEffect::GenKey(const GrGeometryProcessor& gp,
- const GrBatchTracker& bt,
const GrGLSLCaps&,
GrProcessorKeyBuilder* b) {
const DashingLineEffect& de = gp.cast<DashingLineEffect>();
@@ -1168,15 +1152,13 @@ GrGeometryProcessor* DashingLineEffect::Create(GrColor color,
return new DashingLineEffect(color, aaMode, localMatrix, usesLocalCoords);
}
-void DashingLineEffect::getGLProcessorKey(const GrBatchTracker& bt,
- const GrGLSLCaps& caps,
+void DashingLineEffect::getGLProcessorKey(const GrGLSLCaps& caps,
GrProcessorKeyBuilder* b) const {
- GLDashingLineEffect::GenKey(*this, bt, caps, b);
+ GLDashingLineEffect::GenKey(*this, caps, b);
}
-GrGLPrimitiveProcessor* DashingLineEffect::createGLInstance(const GrBatchTracker& bt,
- const GrGLSLCaps&) const {
- return new GLDashingLineEffect(*this, bt);
+GrGLPrimitiveProcessor* DashingLineEffect::createGLInstance(const GrGLSLCaps&) const {
+ return new GLDashingLineEffect();
}
DashingLineEffect::DashingLineEffect(GrColor color,
« src/gpu/effects/GrBitmapTextGeoProc.cpp ('K') | « src/gpu/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrDistanceFieldGeoProc.h » ('j') | src/gpu/effects/GrDistanceFieldGeoProc.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698