diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-12-06 14:47:42 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-07 19:20:19 +0000 |
| commit | 04460ccee50e03b89420cdaa85882a9da083fa38 (patch) | |
| tree | 9c5b83a5822ac6e59cac1555f6043a0d396b6ad3 /src/gpu/effects | |
| parent | e951e4a1dca5c6706b11e402838d9e14de430a05 (diff) | |
Make GrGLSLPrimitiveProcessor::emitTransforms take local coords as GrShaderVar.
Also remove unused position variable parameter.
Change-Id: I37f98a03ac1ca750810de13b08e3ffa11e41828c
Reviewed-on: https://skia-review.googlesource.com/81320
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrBezierEffect.cpp | 10 | ||||
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/effects/GrDistanceFieldGeoProc.cpp | 12 | ||||
| -rw-r--r-- | src/gpu/effects/GrShadowGeoProc.cpp | 3 |
4 files changed, 9 insertions, 19 deletions
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp index ffd7b0657f..5bc04c82ea 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/effects/GrBezierEffect.cpp @@ -97,8 +97,7 @@ void GrGLConicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - gp.inPosition()->fName, + gp.inPosition()->asShaderVar(), gp.localMatrix(), args.fFPCoordTransformHandler); @@ -350,8 +349,7 @@ void GrGLQuadEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - gp.inPosition()->fName, + gp.inPosition()->asShaderVar(), gp.localMatrix(), args.fFPCoordTransformHandler); @@ -578,11 +576,9 @@ void GrGLCubicEffect::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - gp.inPosition()->fName, + gp.inPosition()->asShaderVar(), args.fFPCoordTransformHandler); - GrShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0); GrShaderVar gF("gF", kFloat2_GrSLType, 0); GrShaderVar func("func", kFloat_GrSLType, 0); diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index d5f930fec4..df71f70a1c 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -58,8 +58,7 @@ public: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - btgp.inPosition()->fName, + btgp.inPosition()->asShaderVar(), btgp.localMatrix(), args.fFPCoordTransformHandler); diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index aafabdeb60..fda2f9d5c2 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -72,8 +72,7 @@ public: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - dfTexEffect.inPosition()->fName, + dfTexEffect.inPosition()->asShaderVar(), args.fFPCoordTransformHandler); // add varyings @@ -365,8 +364,7 @@ public: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - dfTexEffect.inPosition()->fName, + dfTexEffect.inPosition()->asShaderVar(), args.fFPCoordTransformHandler); } else { // Setup position @@ -376,8 +374,7 @@ public: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - dfTexEffect.inPosition()->fName, + dfTexEffect.inPosition()->asShaderVar(), dfTexEffect.matrix(), args.fFPCoordTransformHandler); } @@ -633,8 +630,7 @@ public: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - dfTexEffect.inPosition()->fName, + dfTexEffect.inPosition()->asShaderVar(), args.fFPCoordTransformHandler); // set up varyings diff --git a/src/gpu/effects/GrShadowGeoProc.cpp b/src/gpu/effects/GrShadowGeoProc.cpp index ba337d73b0..507101d87b 100644 --- a/src/gpu/effects/GrShadowGeoProc.cpp +++ b/src/gpu/effects/GrShadowGeoProc.cpp @@ -39,8 +39,7 @@ public: this->emitTransforms(vertBuilder, varyingHandler, uniformHandler, - gpArgs->fPositionVar, - rsgp.inPosition()->fName, + rsgp.inPosition()->asShaderVar(), args.fFPCoordTransformHandler); fragBuilder->codeAppend("half d = length(shadowParams.xy);"); |