diff options
Diffstat (limited to 'src/gpu/ops')
| -rw-r--r-- | src/gpu/ops/GrAAConvexPathRenderer.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/ops/GrDashOp.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/ops/GrMSAAPathRenderer.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/ops/GrOvalOpFactory.cpp | 9 | ||||
| -rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 3 |
5 files changed, 9 insertions, 16 deletions
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp index 3c84b32df7..b706d68858 100644 --- a/src/gpu/ops/GrAAConvexPathRenderer.cpp +++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp @@ -582,8 +582,7 @@ public: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - qe.fInPosition->fName, + qe.fInPosition->asShaderVar(), qe.fLocalMatrix, args.fFPCoordTransformHandler); diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp index e87a335af0..34c1a2bc8b 100644 --- a/src/gpu/ops/GrDashOp.cpp +++ b/src/gpu/ops/GrDashOp.cpp @@ -910,8 +910,7 @@ void GLDashingCircleEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - dce.inPosition()->fName, + dce.inPosition()->asShaderVar(), dce.localMatrix(), args.fFPCoordTransformHandler); @@ -1114,8 +1113,7 @@ void GLDashingLineEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - de.inPosition()->fName, + de.inPosition()->asShaderVar(), de.localMatrix(), args.fFPCoordTransformHandler); diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index 50741bc537..8097b7c73c 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -149,8 +149,8 @@ public: qp.viewMatrix(), &fViewMatrixUniform); // emit transforms - this->emitTransforms(vsBuilder, varyingHandler, uniformHandler, gpArgs->fPositionVar, - qp.inPosition()->fName, SkMatrix::I(), + this->emitTransforms(vsBuilder, varyingHandler, uniformHandler, + qp.inPosition()->asShaderVar(), SkMatrix::I(), args.fFPCoordTransformHandler); GrGLSLPPFragmentBuilder* fsBuilder = args.fFragBuilder; diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp index a3256602af..3c4898f848 100644 --- a/src/gpu/ops/GrOvalOpFactory.cpp +++ b/src/gpu/ops/GrOvalOpFactory.cpp @@ -144,8 +144,7 @@ private: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - cgp.fInPosition->fName, + cgp.fInPosition->asShaderVar(), cgp.fLocalMatrix, args.fFPCoordTransformHandler); @@ -293,8 +292,7 @@ private: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - egp.fInPosition->fName, + egp.fInPosition->asShaderVar(), egp.fLocalMatrix, args.fFPCoordTransformHandler); @@ -437,8 +435,7 @@ private: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - diegp.fInPosition->fName, + diegp.fInPosition->asShaderVar(), args.fFPCoordTransformHandler); // for outer curve diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index f9600e5d44..79a22d83e4 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -107,8 +107,7 @@ public: this->emitTransforms(args.fVertBuilder, args.fVaryingHandler, args.fUniformHandler, - gpArgs->fPositionVar, - textureGP.fTextureCoords.fName, + textureGP.fTextureCoords.asShaderVar(), args.fFPCoordTransformHandler); if (args.fShaderCaps->preferFlatInterpolation()) { args.fVaryingHandler->addFlatPassThroughAttribute(&textureGP.fColors, |