Index: src/gpu/GrAAConvexPathRenderer.cpp |
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp |
index fcf38ef7e795252ad94a5b23fb136a52973dc1e1..b64675b2c5694f927d5794103ef06ebb7aec027d 100644 |
--- a/src/gpu/GrAAConvexPathRenderer.cpp |
+++ b/src/gpu/GrAAConvexPathRenderer.cpp |
@@ -535,11 +535,14 @@ public: |
const GrBatchTracker&) |
: fColor(GrColor_ILLEGAL) {} |
- virtual void emitCode(const EmitArgs& args) SK_OVERRIDE { |
+ virtual void emitCode(EmitArgs& args) SK_OVERRIDE { |
const QuadEdgeEffect& qe = args.fGP.cast<QuadEdgeEffect>(); |
GrGLGPBuilder* pb = args.fPB; |
GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); |
+ // emit attributes |
+ vsBuilder->emitAttributes(qe); |
+ |
GrGLVertToFrag v(kVec4f_GrSLType); |
args.fPB->addVarying("QuadEdge", &v); |
vsBuilder->codeAppendf("%s = %s;", v.vsOut(), qe.inQuadEdge()->fName); |
@@ -550,16 +553,20 @@ public: |
this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, NULL, |
&fColorUniform); |
- // setup coord outputs |
- vsBuilder->codeAppendf("%s = %s;", vsBuilder->positionCoords(), qe.inPosition()->fName); |
- vsBuilder->codeAppendf("%s = %s;", vsBuilder->localCoords(), qe.inPosition()->fName); |
- |
// setup uniform viewMatrix |
this->addUniformViewMatrix(pb); |
- // setup position varying |
- vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);", vsBuilder->glPosition(), |
- this->uViewM(), qe.inPosition()->fName); |
+ // Setup position |
+ const char* pos3 = "pos3"; |
+ vsBuilder->codeAppendf("vec3 %s;", pos3); |
+ vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);", pos3, this->uViewM(), |
+ qe.inPosition()->fName); |
+ |
+ // emit transforms |
+ this->emitTransforms(args.fPB, pos3, qe.inPosition()->fName, qe.localMatrix(), |
+ args.fTransformsIn, args.fTransformsOut); |
+ |
+ vsBuilder->transformToNormalizedDeviceSpace(pos3); |
bsalomon
2015/01/13 14:51:14
won't this be repeated for every GP? Maybe we shou
|
GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); |
@@ -622,7 +629,8 @@ public: |
GLProcessor::GenKey(*this, bt, caps, b); |
} |
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE { |
+ virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, |
+ const GrGLCaps&) const SK_OVERRIDE { |
return SkNEW_ARGS(GLProcessor, (*this, bt)); |
} |