src/gpu/effects/GrDashingEffect.cpp - Issue 671023002: Added varying struct

Unified Diff: src/gpu/effects/GrDashingEffect.cpp

Issue 671023002: Added varying struct (Closed) Base URL: https://skia.googlesource.com/skia.git@gp_emit_struct

Patch Set: feedback incorporated Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « src/gpu/effects/GrCustomCoordsTextureEffect.cpp ('k') | src/gpu/effects/GrDistanceFieldTextureEffect.cpp » ('j') | src/gpu/gl/builders/GrGLFragmentShaderBuilder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/gpu/effects/GrDashingEffect.cpp

diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp

index 4f6eef15461ae0ace3f1e2911fab5fe526d257a1..24b9cde316574f12253944884d40ee22f2eba514 100644

--- a/src/gpu/effects/GrDashingEffect.cpp

+++ b/src/gpu/effects/GrDashingEffect.cpp

@@ -514,17 +514,17 @@ void GLDashingCircleEffect::emitCode(const EmitArgs& args) {

"params",

&paramName);

- const char *vsCoordName, *fsCoordName;

- args.fPB->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName);

+ GrGLVertToFrag v("Coord", kVec2f_GrSLType);

+ args.fPB->addVarying(&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("Coord", kVec2f_GrSLType);

+ args.fPB->addVarying(&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.