diff options
author | 2015-01-13 15:02:10 -0800 | |
---|---|---|
committer | 2015-01-13 15:02:10 -0800 | |
commit | abb52a1a70a81915c6196e0fb3e9bcb05e8be14d (patch) | |
tree | 418e114425f0c3d2179bab956076f4f0bcadcca7 /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
parent | a7f11918d92621507f35b228a290f05dcaf0f4b6 (diff) |
Move most of the transform logic into the primitive processors
BUG=skia:
Review URL: https://codereview.chromium.org/822423004
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
-rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 1cfb64414b..0818fc0d8c 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -25,13 +25,16 @@ public: GrGLBitmapTextGeoProc(const GrGeometryProcessor&, const GrBatchTracker&) : fColor(GrColor_ILLEGAL) {} - void emitCode(const EmitArgs& args) SK_OVERRIDE { + void onEmitCode(EmitArgs& args) SK_OVERRIDE { const GrBitmapTextGeoProc& cte = args.fGP.cast<GrBitmapTextGeoProc>(); const BitmapTextBatchTracker& local = args.fBT.cast<BitmapTextBatchTracker>(); GrGLGPBuilder* pb = args.fPB; GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); + // emit attributes + vsBuilder->emitAttributes(cte); + GrGLVertToFrag v(kVec2f_GrSLType); pb->addVarying("TextureCoords", &v); vsBuilder->codeAppendf("%s = %s;", v.vsOut(), cte.inTextureCoords()->fName); @@ -40,17 +43,17 @@ public: this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputColor, cte.inColor(), &fColorUniform); - // setup output coords - vsBuilder->codeAppendf("%s = %s;", vsBuilder->positionCoords(), cte.inPosition()->fName); - vsBuilder->codeAppendf("%s = %s;", vsBuilder->localCoords(), cte.inPosition()->fName); - // setup uniform viewMatrix this->addUniformViewMatrix(pb); - // setup position varying - vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);", vsBuilder->glPosition(), this->uViewM(), + // Setup position + vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);", this->position(), this->uViewM(), cte.inPosition()->fName); + // emit transforms + this->emitTransforms(args.fPB, this->position(), cte.inPosition()->fName, + cte.localMatrix(), args.fTransformsIn, args.fTransformsOut); + GrGLGPFragmentBuilder* fsBuilder = pb->getFragmentShaderBuilder(); fsBuilder->codeAppendf("%s = ", args.fOutputCoverage); fsBuilder->appendTextureLookup(args.fSamplers[0], v.fsIn(), kVec2f_GrSLType); @@ -135,8 +138,9 @@ void GrBitmapTextGeoProc::getGLProcessorKey(const GrBatchTracker& bt, GrGLBitmapTextGeoProc::GenKey(*this, bt, caps, b); } -GrGLGeometryProcessor* -GrBitmapTextGeoProc::createGLInstance(const GrBatchTracker& bt) const { +GrGLPrimitiveProcessor* +GrBitmapTextGeoProc::createGLInstance(const GrBatchTracker& bt, + const GrGLCaps& caps) const { return SkNEW_ARGS(GrGLBitmapTextGeoProc, (*this, bt)); } |