Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1000)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 519473003: Use highp for gpu bezier effects (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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
Download patch
« no previous file with comments | « no previous file | src/gpu/gl/builders/GrGLShaderBuilder.h » ('j') | src/gpu/gl/builders/GrGLShaderBuilder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/effects/GrBezierEffect.cpp
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
index 7384f62856c91378014f114d3fdee8c026a8e02a..6a2f4ba706dd5d800a0ff214d546131216edafe1 100644
--- a/src/gpu/effects/GrBezierEffect.cpp
+++ b/src/gpu/effects/GrBezierEffect.cpp
@@ -60,56 +60,90 @@ void GrGLConicEffect::emitCode(GrGLFullProgramBuilder* builder,
vsBuilder->codeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());
GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();
- fsBuilder->codeAppend("\t\tfloat edgeAlpha;\n");
+
+ GrGLShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dklmdx("dklmdx", kVec3f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dklmdy("dklmdy", kVec3f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dfdx("dfdx", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dfdy("dfdy", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar gF("gF", kVec2f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar gFM("gFM", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar func("func", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+
+ fsBuilder->declAppend(edgeAlpha, *builder);
+ fsBuilder->declAppend(dklmdx, *builder);
+ fsBuilder->declAppend(dklmdy, *builder);
+ fsBuilder->declAppend(dfdx, *builder);
+ fsBuilder->declAppend(dfdy, *builder);
+ fsBuilder->declAppend(gF, *builder);
+ fsBuilder->declAppend(gFM, *builder);
+ fsBuilder->declAppend(func, *builder);
switch (fEdgeType) {
case kHairlineAA_GrEffectEdgeType: {
SkAssertResult(fsBuilder->enableFeature(
GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
- fsBuilder->codeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdx =\n"
- "\t\t\t2.0*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
- fsName, fsName, fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdy =\n"
- "\t\t\t2.0*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
- fsName, fsName, fsName);
- fsBuilder->codeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
- fsBuilder->codeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
- fsBuilder->codeAppendf("\t\tfloat func = %s.x*%s.x - %s.y*%s.z;\n", fsName, fsName,
- fsName, fsName);
- fsBuilder->codeAppend("\t\tfunc = abs(func);\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = func / gFM;\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = max(1.0 - edgeAlpha, 0.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = dFdx(%s.xyz);\n", dklmdx.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = dFdy(%s.xyz);\n", dklmdy.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t\t2.0 * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdx.c_str(), fsName, dklmdx.c_str(), fsName, dklmdx.c_str(),
+ fsName, dklmdx.c_str());
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t\t2.0 * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdy.c_str(), fsName, dklmdy.c_str(), fsName, dklmdy.c_str(),
+ fsName, dklmdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = vec2(%s, %s);\n",
+ gF.c_str(), dfdx.c_str(), dfdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = sqrt(dot(%s, %s));\n",
+ gFM.c_str(), gF.c_str(), gF.c_str());
+ fsBuilder->codeAppendf("\t\t%s = %s.x*%s.x - %s.y*%s.z;\n",
+ func.c_str(), fsName, fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = abs(%s);\n", func.c_str(), func.c_str());
+ fsBuilder->codeAppendf("\t\t%s = %s / %s;\n",
+ edgeAlpha.c_str(), func.c_str(), gFM.c_str());
+ fsBuilder->codeAppendf("\t\t%s = max(1.0 - %s, 0.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
// Add line below for smooth cubic ramp
- // fsBuilder->codeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+ // fsBuilder->codeAppendf("\t\t%s = %s * %s * (3.0 - 2.0 * %s);\n",
+ // edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+ // edgeAlpha.c_str());
break;
}
case kFillAA_GrEffectEdgeType: {
SkAssertResult(fsBuilder->enableFeature(
GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
- fsBuilder->codeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdx =\n"
- "\t\t\t2.0*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
- fsName, fsName, fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdy =\n"
- "\t\t\t2.0*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
- fsName, fsName, fsName);
- fsBuilder->codeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
- fsBuilder->codeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
- fsBuilder->codeAppendf("\t\tfloat func = %s.x*%s.x - %s.y*%s.z;\n", fsName, fsName,
- fsName, fsName);
- fsBuilder->codeAppend("\t\tedgeAlpha = func / gFM;\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = dFdx(%s.xyz);\n", dklmdx.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = dFdy(%s.xyz);\n", dklmdy.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t\t2.0 * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdx.c_str(), fsName, dklmdx.c_str(), fsName, dklmdx.c_str(),
+ fsName, dklmdx.c_str());
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t\t2.0 * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdy.c_str(), fsName, dklmdy.c_str(), fsName, dklmdy.c_str(),
+ fsName, dklmdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = vec2(%s, %s);\n",
+ gF.c_str(), dfdx.c_str(), dfdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = sqrt(dot(%s, %s));\n",
+ gFM.c_str(), gF.c_str(), gF.c_str());
+ fsBuilder->codeAppendf("\t\t%s = %s.x*%s.x - %s.y*%s.z;\n",
+ func.c_str(), fsName, fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = %s / %s;\n",
+ edgeAlpha.c_str(), func.c_str(), gFM.c_str());
+ fsBuilder->codeAppendf("\t\t%s = clamp(1.0 - %s, 0.0, 1.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
// Add line below for smooth cubic ramp
- // fsBuilder->codeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+ // fsBuilder->codeAppendf("\t\t%s = %s * %s * (3.0 - 2.0 * %s);\n",
+ // edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+ // edgeAlpha.c_str());
break;
}
case kFillBW_GrEffectEdgeType: {
- fsBuilder->codeAppendf("\t\tedgeAlpha = %s.x*%s.x - %s.y*%s.z;\n", fsName, fsName,
- fsName, fsName);
- fsBuilder->codeAppend("\t\tedgeAlpha = float(edgeAlpha < 0.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = %s.x*%s.x - %s.y*%s.z;\n",
+ edgeAlpha.c_str(), fsName, fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = float(%s < 0.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
break;
}
default:
@@ -117,7 +151,7 @@ void GrGLConicEffect::emitCode(GrGLFullProgramBuilder* builder,
}
fsBuilder->codeAppendf("\t%s = %s;\n", outputColor,
- (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+ (GrGLSLExpr4(inputColor) * GrGLSLExpr1(edgeAlpha.c_str())).c_str());
}
void GrGLConicEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
@@ -211,45 +245,66 @@ void GrGLQuadEffect::emitCode(GrGLFullProgramBuilder* builder,
vsBuilder->codeAppendf("\t%s = %s;\n", vsName, attrName->c_str());
GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();
- fsBuilder->codeAppendf("\t\tfloat edgeAlpha;\n");
+
+ GrGLShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar duvdx("duvdx", kVec2f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar duvdy("duvdy", kVec2f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar gF("gF", kVec2f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+
+ fsBuilder->declAppend(edgeAlpha, *builder);
+ fsBuilder->declAppend(duvdx, *builder);
+ fsBuilder->declAppend(duvdy, *builder);
+ fsBuilder->declAppend(gF, *builder);
switch (fEdgeType) {
case kHairlineAA_GrEffectEdgeType: {
SkAssertResult(fsBuilder->enableFeature(
GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
- fsBuilder->codeAppendf("\t\tvec2 duvdx = dFdx(%s.xy);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec2 duvdy = dFdy(%s.xy);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,\n"
- "\t\t 2.0*%s.x*duvdy.x - duvdy.y);\n",
- fsName, fsName);
- fsBuilder->codeAppendf("\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
- fsName);
- fsBuilder->codeAppend("\t\tedgeAlpha = sqrt(edgeAlpha*edgeAlpha / dot(gF, gF));\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = max(1.0 - edgeAlpha, 0.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = dFdx(%s.xy);\n", duvdx.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = dFdy(%s.xy);\n", duvdy.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = vec2(2.0 * %s.x * %s.x - %s.y,\n"
+ "\t\t 2.0 * %s.x * %s.x - %s.y);\n",
+ gF.c_str(), fsName, duvdx.c_str(), duvdx.c_str(),
+ fsName, duvdy.c_str(), duvdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = (%s.x * %s.x - %s.y);\n",
+ edgeAlpha.c_str(), fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = sqrt(%s * %s / dot(%s, %s));\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+ gF.c_str(), gF.c_str());
+ fsBuilder->codeAppendf("\t\t%s = max(1.0 - %s, 0.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
// Add line below for smooth cubic ramp
- // fsBuilder->codeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+ // fsBuilder->codeAppendf("\t\t%s = %s * %s * (3.0 - 2.0 * %s);\n",
+ // edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+ // edgeAlpha.c_str());
break;
}
case kFillAA_GrEffectEdgeType: {
SkAssertResult(fsBuilder->enableFeature(
GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
- fsBuilder->codeAppendf("\t\tvec2 duvdx = dFdx(%s.xy);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec2 duvdy = dFdy(%s.xy);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,\n"
- "\t\t 2.0*%s.x*duvdy.x - duvdy.y);\n",
- fsName, fsName);
- fsBuilder->codeAppendf("\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
- fsName);
- fsBuilder->codeAppend("\t\tedgeAlpha = edgeAlpha / sqrt(dot(gF, gF));\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = dFdx(%s.xy);\n", duvdx.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = dFdy(%s.xy);\n", duvdy.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = vec2(2.0 * %s.x * %s.x - %s.y,\n"
+ "\t\t 2.0 * %s.x * %s.x - %s.y);\n",
+ gF.c_str(), fsName, duvdx.c_str(), duvdx.c_str(),
+ fsName, duvdy.c_str(), duvdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = (%s.x*%s.x - %s.y);\n",
+ edgeAlpha.c_str(), fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = %s / sqrt(dot(%s, %s));\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str(), gF.c_str(), gF.c_str());
+ fsBuilder->codeAppendf("\t\t%s = clamp(1.0 - %s, 0.0, 1.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
// Add line below for smooth cubic ramp
- // fsBuilder->codeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+ // fsBuilder->codeAppendf("\t\t%s = %s * %s * (3.0 - 2.0 * %s);\n",
+ // edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+ // edgeAlpha.c_str());
break;
}
case kFillBW_GrEffectEdgeType: {
- fsBuilder->codeAppendf("\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
- fsName);
- fsBuilder->codeAppend("\t\tedgeAlpha = float(edgeAlpha < 0.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = (%s.x*%s.x - %s.y);\n",
+ edgeAlpha.c_str(), fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = float(%s < 0.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
break;
}
default:
@@ -257,7 +312,7 @@ void GrGLQuadEffect::emitCode(GrGLFullProgramBuilder* builder,
}
fsBuilder->codeAppendf("\t%s = %s;\n", outputColor,
- (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+ (GrGLSLExpr4(inputColor) * GrGLSLExpr1(edgeAlpha.c_str())).c_str());
}
void GrGLQuadEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
@@ -353,56 +408,90 @@ void GrGLCubicEffect::emitCode(GrGLFullProgramBuilder* builder,
vsBuilder->codeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());
GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();
- fsBuilder->codeAppend("\t\tfloat edgeAlpha;\n");
+
+ GrGLShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dklmdx("dklmdx", kVec3f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dklmdy("dklmdy", kVec3f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dfdx("dfdx", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar dfdy("dfdy", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar gF("gF", kVec2f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar gFM("gFM", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+ GrGLShaderVar func("func", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);
+
+ fsBuilder->declAppend(edgeAlpha, *builder);
+ fsBuilder->declAppend(dklmdx, *builder);
+ fsBuilder->declAppend(dklmdy, *builder);
+ fsBuilder->declAppend(dfdx, *builder);
+ fsBuilder->declAppend(dfdy, *builder);
+ fsBuilder->declAppend(gF, *builder);
+ fsBuilder->declAppend(gFM, *builder);
+ fsBuilder->declAppend(func, *builder);
switch (fEdgeType) {
case kHairlineAA_GrEffectEdgeType: {
SkAssertResult(fsBuilder->enableFeature(
GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
- fsBuilder->codeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdx =\n"
- "\t\t3.0*%s.x*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
- fsName, fsName, fsName, fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdy =\n"
- "\t\t3.0*%s.x*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
- fsName, fsName, fsName, fsName);
- fsBuilder->codeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
- fsBuilder->codeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
- fsBuilder->codeAppendf("\t\tfloat func = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
- fsName, fsName, fsName, fsName, fsName);
- fsBuilder->codeAppend("\t\tfunc = abs(func);\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = func / gFM;\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = max(1.0 - edgeAlpha, 0.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = dFdx(%s.xyz);\n", dklmdx.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = dFdy(%s.xyz);\n", dklmdy.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdx.c_str(), fsName, fsName, dklmdx.c_str(), fsName,
+ dklmdx.c_str(), fsName, dklmdx.c_str());
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdy.c_str(), fsName, fsName, dklmdy.c_str(), fsName,
+ dklmdy.c_str(), fsName, dklmdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = vec2(%s, %s);\n",
+ gF.c_str(), dfdx.c_str(), dfdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = sqrt(dot(%s, %s));\n",
+ gFM.c_str(), gF.c_str(), gF.c_str());
+ fsBuilder->codeAppendf("\t\t%s = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
+ func.c_str(), fsName, fsName, fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = abs(%s);\n", func.c_str(), func.c_str());
+ fsBuilder->codeAppendf("\t\t%s = %s / %s;\n",
+ edgeAlpha.c_str(), func.c_str(), gFM.c_str());
+ fsBuilder->codeAppendf("\t\t%s = max(1.0 - %s, 0.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
// Add line below for smooth cubic ramp
- // fsBuilder->codeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+ // fsBuilder->codeAppendf("\t\t%s = %s * %s * (3.0 - 2.0 * %s);\n",
+ // edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+ // edgeAlpha.c_str());
break;
}
case kFillAA_GrEffectEdgeType: {
SkAssertResult(fsBuilder->enableFeature(
GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
- fsBuilder->codeAppendf("\t\tvec3 dklmdx = dFdx(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tvec3 dklmdy = dFdy(%s.xyz);\n", fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdx =\n"
- "\t\t3.0*%s.x*%s.x*dklmdx.x - %s.y*dklmdx.z - %s.z*dklmdx.y;\n",
- fsName, fsName, fsName, fsName);
- fsBuilder->codeAppendf("\t\tfloat dfdy =\n"
- "\t\t3.0*%s.x*%s.x*dklmdy.x - %s.y*dklmdy.z - %s.z*dklmdy.y;\n",
- fsName, fsName, fsName, fsName);
- fsBuilder->codeAppend("\t\tvec2 gF = vec2(dfdx, dfdy);\n");
- fsBuilder->codeAppend("\t\tfloat gFM = sqrt(dot(gF, gF));\n");
- fsBuilder->codeAppendf("\t\tfloat func = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
- fsName, fsName, fsName, fsName, fsName);
- fsBuilder->codeAppend("\t\tedgeAlpha = func / gFM;\n");
- fsBuilder->codeAppend("\t\tedgeAlpha = clamp(1.0 - edgeAlpha, 0.0, 1.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = dFdx(%s.xyz);\n", dklmdx.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s = dFdy(%s.xyz);\n", dklmdy.c_str(), fsName);
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdx.c_str(), fsName, fsName, dklmdx.c_str(), fsName,
+ dklmdx.c_str(), fsName, dklmdx.c_str());
+ fsBuilder->codeAppendf("\t\t%s =\n"
+ "\t\t3.0 * %s.x * %s.x * %s.x - %s.y * %s.z - %s.z * %s.y;\n",
+ dfdy.c_str(), fsName, fsName, dklmdy.c_str(), fsName,
+ dklmdy.c_str(), fsName, dklmdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = vec2(%s, %s);\n",
+ gF.c_str(), dfdx.c_str(), dfdy.c_str());
+ fsBuilder->codeAppendf("\t\t%s = sqrt(dot(%s, %s));\n",
+ gFM.c_str(), gF.c_str(), gF.c_str());
+ fsBuilder->codeAppendf("\t\t%s = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
+ func.c_str(), fsName, fsName, fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = %s / %s;\n",
+ edgeAlpha.c_str(), func.c_str(), gFM.c_str());
+ fsBuilder->codeAppendf("\t\t%s = clamp(1.0 - %s, 0.0, 1.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
// Add line below for smooth cubic ramp
- // fsBuilder->codeAppend("\t\tedgeAlpha = edgeAlpha*edgeAlpha*(3.0-2.0*edgeAlpha);\n");
+ // fsBuilder->codeAppendf("\t\t%s = %s * %s * (3.0 - 2.0 * %s);\n",
+ // edgeAlpha.c_str(), edgeAlpha.c_str(), edgeAlpha.c_str(),
+ // edgeAlpha.c_str());
break;
}
case kFillBW_GrEffectEdgeType: {
- fsBuilder->codeAppendf("\t\tedgeAlpha = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
- fsName, fsName, fsName, fsName, fsName);
- fsBuilder->codeAppend("\t\tedgeAlpha = float(edgeAlpha < 0.0);\n");
+ fsBuilder->codeAppendf("\t\t%s = %s.x*%s.x*%s.x - %s.y*%s.z;\n",
+ edgeAlpha.c_str(), fsName, fsName, fsName, fsName, fsName);
+ fsBuilder->codeAppendf("\t\t%s = float(%s < 0.0);\n",
+ edgeAlpha.c_str(), edgeAlpha.c_str());
break;
}
default:
@@ -410,7 +499,7 @@ void GrGLCubicEffect::emitCode(GrGLFullProgramBuilder* builder,
}
fsBuilder->codeAppendf("\t%s = %s;\n", outputColor,
- (GrGLSLExpr4(inputColor) * GrGLSLExpr1("edgeAlpha")).c_str());
+ (GrGLSLExpr4(inputColor) * GrGLSLExpr1(edgeAlpha.c_str())).c_str());
}
void GrGLCubicEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
« no previous file with comments | « no previous file | src/gpu/gl/builders/GrGLShaderBuilder.h » ('j') | src/gpu/gl/builders/GrGLShaderBuilder.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698