diff options
author | 2014-10-24 07:56:04 -0700 | |
---|---|---|
committer | 2014-10-24 07:56:04 -0700 | |
commit | 852ae80b9c3c6fd53f993ac35133d80863993cbe (patch) | |
tree | 59aa7b7fd0d319b3fcc15cc2fa291689b2a68bb3 /src/gpu/effects/GrDashingEffect.cpp | |
parent | 8dae0f364b04da1584554f94fc30b3263dae5c3a (diff) |
Added varying struct
TBR=
BUG=skia:
Review URL: https://codereview.chromium.org/671023002
Diffstat (limited to 'src/gpu/effects/GrDashingEffect.cpp')
-rw-r--r-- | src/gpu/effects/GrDashingEffect.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp index 4f6eef1546..e15ffbed7c 100644 --- a/src/gpu/effects/GrDashingEffect.cpp +++ b/src/gpu/effects/GrDashingEffect.cpp @@ -514,17 +514,17 @@ void GLDashingCircleEffect::emitCode(const EmitArgs& args) { "params", ¶mName); - const char *vsCoordName, *fsCoordName; - args.fPB->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName); + GrGLVertToFrag v(kVec2f_GrSLType); + args.fPB->addVarying("Coord", &v); GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); - vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, dce.inCoord().c_str()); + vsBuilder->codeAppendf("\t%s = %s;\n", v.vsOut(), dce.inCoord().c_str()); // transforms all points so that we can compare them to our test circle GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t\tfloat xShifted = %s.x - floor(%s.x / %s.z) * %s.z;\n", - fsCoordName, fsCoordName, paramName, paramName); - fsBuilder->codeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", fsCoordName); + v.fsIn(), v.fsIn(), paramName, paramName); + fsBuilder->codeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", v.fsIn()); fsBuilder->codeAppendf("\t\tvec2 center = vec2(%s.y, 0.0);\n", paramName); fsBuilder->codeAppend("\t\tfloat dist = length(center - fragPosShifted);\n"); if (GrProcessorEdgeTypeIsAA(dce.getEdgeType())) { @@ -718,16 +718,16 @@ void GLDashingLineEffect::emitCode(const EmitArgs& args) { "interval", &intervalName); - const char *vsCoordName, *fsCoordName; - args.fPB->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName); + GrGLVertToFrag v(kVec2f_GrSLType); + args.fPB->addVarying("Coord", &v); GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder(); - vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, de.inCoord().c_str()); + vsBuilder->codeAppendf("\t%s = %s;\n", v.vsOut(), de.inCoord().c_str()); // transforms all points so that we can compare them to our test rect GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder(); fsBuilder->codeAppendf("\t\tfloat xShifted = %s.x - floor(%s.x / %s) * %s;\n", - fsCoordName, fsCoordName, intervalName, intervalName); - fsBuilder->codeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", fsCoordName); + v.fsIn(), v.fsIn(), intervalName, intervalName); + fsBuilder->codeAppendf("\t\tvec2 fragPosShifted = vec2(xShifted, %s.y);\n", v.fsIn()); if (GrProcessorEdgeTypeIsAA(de.getEdgeType())) { // The amount of coverage removed in x and y by the edges is computed as a pair of negative // numbers, xSub and ySub. |