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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 746423007: Draft change to start pulling uniform color into GP (Closed) Base URL: https://skia.googlesource.com/skia.git@no_factories
Patch Set: cleanup Created 6 years 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/GrGeometryProcessor.cpp ('K') | « src/gpu/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrDistanceFieldTextureEffect.h » ('j') | src/gpu/gl/GrGLGeometryProcessor.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 1641d272fcc1f607009f081a23083b5f27989628..fce79cbbfed5ebfac1c915bd363afd76fabc4960 100644
--- a/src/gpu/effects/GrDashingEffect.cpp
+++ b/src/gpu/effects/GrDashingEffect.cpp
@@ -441,6 +441,12 @@ bool GrDashingEffect::DrawDashLine(GrGpu* gpu, GrDrawTarget* target, GrDrawState
//////////////////////////////////////////////////////////////////////////////
class GLDashingCircleEffect;
+
+struct DashingCircleBatchTracker {
+ GPInput fInputColorType;
+ GrColor fColor;
+};
+
/*
* This effect will draw a dotted line (defined as a dashed lined with round caps and no on
* interval). The radius of the dots is given by the strokeWidth and the spacing by the DashInfo.
@@ -481,6 +487,10 @@ public:
virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker&) const SK_OVERRIDE;
+ void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
+
+ bool onCanBatch(const GrBatchTracker& l, const GrBatchTracker& r) const SK_OVERRIDE;
+
private:
DashingCircleEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info,
SkScalar radius);
@@ -519,10 +529,11 @@ public:
const GrBatchTracker&) SK_OVERRIDE;
private:
- GrGLProgramDataManager::UniformHandle fParamUniform;
- SkScalar fPrevRadius;
- SkScalar fPrevCenterX;
- SkScalar fPrevIntervalLength;
+ UniformHandle fParamUniform;
+ UniformHandle fColorUniform;
+ SkScalar fPrevRadius;
+ SkScalar fPrevCenterX;
+ SkScalar fPrevIntervalLength;
typedef GrGLGeometryProcessor INHERITED;
};
@@ -535,6 +546,8 @@ GLDashingCircleEffect::GLDashingCircleEffect(const GrGeometryProcessor&,
void GLDashingCircleEffect::emitCode(const EmitArgs& args) {
const DashingCircleEffect& dce = args.fGP.cast<DashingCircleEffect>();
+ const DashingCircleBatchTracker local = args.fBT.cast<DashingCircleBatchTracker>();
+ GrGLGPBuilder* pb = args.fPB;
const char *paramName;
// The param uniforms, xyz, refer to circle radius - 0.5, cicles center x coord, and
// the total interval length of the dash.
@@ -548,6 +561,9 @@ void GLDashingCircleEffect::emitCode(const EmitArgs& args) {
args.fPB->addVarying("Coord", &v);
vsBuilder->codeAppendf("%s = %s;", v.vsOut(), dce.inCoord()->fName);
+ // Setup pass through color
+ this->setupColor(pb, local.fInputColorType, args.fOutputColor, NULL, &fColorUniform);
+
// setup coord outputs
vsBuilder->codeAppendf("%s = %s;", vsBuilder->positionCoords(), dce.inPosition()->fName);
vsBuilder->codeAppendf("%s = %s;", vsBuilder->localCoords(), dce.inPosition()->fName);
@@ -576,7 +592,7 @@ void GLDashingCircleEffect::emitCode(const EmitArgs& args) {
void GLDashingCircleEffect::setData(const GrGLProgramDataManager& pdman,
const GrGeometryProcessor& processor,
- const GrBatchTracker&) {
+ const GrBatchTracker& bt) {
const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>();
SkScalar radius = dce.getRadius();
SkScalar centerX = dce.getCenterX();
@@ -587,14 +603,19 @@ void GLDashingCircleEffect::setData(const GrGLProgramDataManager& pdman,
fPrevCenterX = centerX;
fPrevIntervalLength = intervalLength;
}
+
+ const DashingCircleBatchTracker& local = bt.cast<DashingCircleBatchTracker>();
+ this->setUniformColorIfRequired(pdman, local.fInputColorType, local.fColor,
+ fColorUniform);
}
void GLDashingCircleEffect::GenKey(const GrGeometryProcessor& processor,
- const GrBatchTracker&,
+ const GrBatchTracker& bt,
const GrGLCaps&,
GrProcessorKeyBuilder* b) {
+ const DashingCircleBatchTracker& local = bt.cast<DashingCircleBatchTracker>();
const DashingCircleEffect& dce = processor.cast<DashingCircleEffect>();
- b->add32(dce.getEdgeType());
+ b->add32(dce.getEdgeType() << 16 | local.fInputColorType);
}
//////////////////////////////////////////////////////////////////////////////
@@ -649,6 +670,21 @@ bool DashingCircleEffect::onIsEqual(const GrGeometryProcessor& other) const {
fCenterX == dce.fCenterX);
}
+void DashingCircleEffect::initBatchTracker(GrBatchTracker* bt, const InitBT& init) const {
+ DashingCircleBatchTracker* local = bt->cast<DashingCircleBatchTracker>();
+
+ // We will ignore this color unless we have uniform color
+ local->fColor = init.fColor;
+ local->fInputColorType = GetColorInputType(init, false);
+}
+
+bool DashingCircleEffect::onCanBatch(const GrBatchTracker& l, const GrBatchTracker& r) const {
+ const DashingCircleBatchTracker& left = l.cast<DashingCircleBatchTracker>();
+ const DashingCircleBatchTracker& right = r.cast<DashingCircleBatchTracker>();
+ return CanCombineOutput(left.fInputColorType, left.fColor,
+ right.fInputColorType, right.fColor);
+}
+
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingCircleEffect);
GrGeometryProcessor* DashingCircleEffect::TestCreate(SkRandom* random,
@@ -673,6 +709,11 @@ GrGeometryProcessor* DashingCircleEffect::TestCreate(SkRandom* random,
class GLDashingLineEffect;
+struct DashingLineBatchTracker {
+ GPInput fInputColorType;
+ GrColor fColor;
+};
+
/*
* This effect will draw a dashed line. The width of the dash is given by the strokeWidth and the
* length and spacing by the DashInfo. Both of the previous two parameters are in device space.
@@ -711,6 +752,10 @@ public:
virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
+ void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE;
+
+ bool onCanBatch(const GrBatchTracker& l, const GrBatchTracker& r) const SK_OVERRIDE;
+
private:
DashingLineEffect(GrColor, GrPrimitiveEdgeType edgeType, const DashInfo& info,
SkScalar strokeWidth);
@@ -748,10 +793,11 @@ public:
const GrBatchTracker&) SK_OVERRIDE;
private:
- GrGLProgramDataManager::UniformHandle fRectUniform;
- GrGLProgramDataManager::UniformHandle fIntervalUniform;
- SkRect fPrevRect;
- SkScalar fPrevIntervalLength;
+ UniformHandle fRectUniform;
+ UniformHandle fIntervalUniform;
+ UniformHandle fColorUniform;
+ SkRect fPrevRect;
+ SkScalar fPrevIntervalLength;
typedef GrGLGeometryProcessor INHERITED;
};
@@ -763,6 +809,8 @@ GLDashingLineEffect::GLDashingLineEffect(const GrGeometryProcessor&,
void GLDashingLineEffect::emitCode(const EmitArgs& args) {
const DashingLineEffect& de = args.fGP.cast<DashingLineEffect>();
+ const DashingLineBatchTracker& local = args.fBT.cast<DashingLineBatchTracker>();
+ GrGLGPBuilder* pb = args.fPB;
const char *rectName;
// The rect uniform's xyzw refer to (left + 0.5, top + 0.5, right - 0.5, bottom - 0.5),
// respectively.
@@ -784,6 +832,9 @@ void GLDashingLineEffect::emitCode(const EmitArgs& args) {
args.fPB->addVarying("Coord", &v);
vsBuilder->codeAppendf("%s = %s;", v.vsOut(), de.inCoord()->fName);
+ // Setup pass through color
+ this->setupColor(pb, local.fInputColorType, args.fOutputColor, NULL, &fColorUniform);
+
// setup coord outputs
vsBuilder->codeAppendf("%s = %s;", vsBuilder->positionCoords(), de.inPosition()->fName);
vsBuilder->codeAppendf("%s = %s;", vsBuilder->localCoords(), de.inPosition()->fName);
@@ -819,7 +870,7 @@ void GLDashingLineEffect::emitCode(const EmitArgs& args) {
void GLDashingLineEffect::setData(const GrGLProgramDataManager& pdman,
const GrGeometryProcessor& processor,
- const GrBatchTracker&) {
+ const GrBatchTracker& bt) {
const DashingLineEffect& de = processor.cast<DashingLineEffect>();
const SkRect& rect = de.getRect();
SkScalar intervalLength = de.getIntervalLength();
@@ -830,14 +881,18 @@ void GLDashingLineEffect::setData(const GrGLProgramDataManager& pdman,
fPrevRect = rect;
fPrevIntervalLength = intervalLength;
}
+
+ const DashingLineBatchTracker& local = bt.cast<DashingLineBatchTracker>();
+ this->setUniformColorIfRequired(pdman, local.fInputColorType, local.fColor, fColorUniform);
}
void GLDashingLineEffect::GenKey(const GrGeometryProcessor& processor,
- const GrBatchTracker&,
+ const GrBatchTracker& bt,
const GrGLCaps&,
GrProcessorKeyBuilder* b) {
+ const DashingLineBatchTracker& local = bt.cast<DashingLineBatchTracker>();
const DashingLineEffect& de = processor.cast<DashingLineEffect>();
- b->add32(de.getEdgeType());
+ b->add32(de.getEdgeType() << 16 | local.fInputColorType);
}
//////////////////////////////////////////////////////////////////////////////
@@ -892,6 +947,21 @@ bool DashingLineEffect::onIsEqual(const GrGeometryProcessor& other) const {
fIntervalLength == de.fIntervalLength);
}
+void DashingLineEffect::initBatchTracker(GrBatchTracker* bt, const InitBT& init) const {
+ DashingLineBatchTracker* local = bt->cast<DashingLineBatchTracker>();
+
+ // We will ignore this color unless we have uniform color
+ local->fColor = init.fColor;
+ local->fInputColorType = GetColorInputType(init, false);
+}
+
+bool DashingLineEffect::onCanBatch(const GrBatchTracker& l, const GrBatchTracker& r) const {
+ const DashingLineBatchTracker& left = l.cast<DashingLineBatchTracker>();
+ const DashingLineBatchTracker& right = r.cast<DashingLineBatchTracker>();
+ return CanCombineOutput(left.fInputColorType, left.fColor,
+ right.fInputColorType, right.fColor);
+}
+
GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingLineEffect);
GrGeometryProcessor* DashingLineEffect::TestCreate(SkRandom* random,
« src/gpu/GrGeometryProcessor.cpp ('K') | « src/gpu/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrDistanceFieldTextureEffect.h » ('j') | src/gpu/gl/GrGLGeometryProcessor.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698