AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reworked gradient shader to no longer explicitly set gl_FragColor or return prematurely.

Browse Source 
This should fix failing linux buildbot, and should play nicer with programs that don't use the gl_FragColor global, or that have multiple stages.
Also disabled debug printing from revision 4445.
Review URL: https://codereview.appspot.com/6345063

git-svn-id: http://skia.googlecode.com/svn/trunk@4454 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
rileya@google.com 2012-07-03 18:03:04 +00:00
parent 2f89179395
commit e38160c38c
3 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/gpu/effects/GrGradientEffects.cpp
View File

@ -475,6 +475,10 @@ void GrGLConical2Gradient::emitFS(GrGLShaderBuilder* state,
p3.c_str(), p5.c_str()); p3.c_str(), p5.c_str());
} }
// output will default to transparent black (we simply won't write anything
// else to it if invalid, instead of discarding or returning prematurely)
code->appendf("\t%s = vec4(0.0,0.0,0.0,0.0);\n", outputColor);
// c = (x^2)+(y^2) - params[4] // c = (x^2)+(y^2) - params[4]
code->appendf("\tfloat %s = dot(%s, %s) - %s;\n", cName.c_str(), code->appendf("\tfloat %s = dot(%s, %s) - %s;\n", cName.c_str(),
state->fSampleCoords.c_str(), state->fSampleCoords.c_str(), state->fSampleCoords.c_str(), state->fSampleCoords.c_str(),
@ -491,43 +495,58 @@ void GrGLConical2Gradient::emitFS(GrGLShaderBuilder* state,
code->appendf("\tfloat %s = %s * %s - %s;\n", dName.c_str(), code->appendf("\tfloat %s = %s * %s - %s;\n", dName.c_str(),
bVar.c_str(), bVar.c_str(), ac4Name.c_str()); bVar.c_str(), bVar.c_str(), ac4Name.c_str());
// if discriminant is < 0, set to transparent black and return // only proceed if discriminant is >= 0
code->appendf("\tif (%s < 0.0) {\n\t\tgl_FragColor = vec4(0.0,0.0,0.0," code->appendf("\tif (%s >= 0.0) {\n", dName.c_str());
"0.0);\n\t\treturn;\n\t}\n", dName.c_str());
// intermediate value we'll use to compute the roots // intermediate value we'll use to compute the roots
// q = -0.5 * (b +/- sqrt(d)) // q = -0.5 * (b +/- sqrt(d))
code->appendf("\tfloat %s = -0.5 * (%s + (%s < 0.0 ? -1.0 : 1.0)" code->appendf("\t\tfloat %s = -0.5 * (%s + (%s < 0.0 ? -1.0 : 1.0)"
" * sqrt(%s));\n", qName.c_str(), bVar.c_str(), " * sqrt(%s));\n", qName.c_str(), bVar.c_str(),
bVar.c_str(), dName.c_str()); bVar.c_str(), dName.c_str());
// compute both roots // compute both roots
// r0 = q * params[1] // r0 = q * params[1]
code->appendf("\tfloat %s = %s * %s;\n", r0Name.c_str(), qName.c_str(), code->appendf("\t\tfloat %s = %s * %s;\n", r0Name.c_str(),
p1.c_str()); qName.c_str(), p1.c_str());
// r1 = c / q // r1 = c / q
code->appendf("\tfloat %s = %s / %s;\n", r1Name.c_str(), cName.c_str(), code->appendf("\t\tfloat %s = %s / %s;\n", r1Name.c_str(),
qName.c_str()); cName.c_str(), qName.c_str());
// Note: If there are two roots that both generate radius(t) > 0, the // Note: If there are two roots that both generate radius(t) > 0, the
// Canvas spec says to choose the larger t. // Canvas spec says to choose the larger t.
// so we'll look at the larger one first: // so we'll look at the larger one first:
code->appendf("\tfloat %s = max(%s, %s);\n", tName.c_str(), code->appendf("\t\tfloat %s = max(%s, %s);\n", tName.c_str(),
r0Name.c_str(), r1Name.c_str()); r0Name.c_str(), r1Name.c_str());
// if r(t) for the larger root is <= 0, try the other one // if r(t) > 0, then we're done; t will be our x coordinate
code->appendf("\tif (%s * %s + %s <= 0.0) {\n", tName.c_str(), code->appendf("\t\tif (%s * %s + %s > 0.0) {\n", tName.c_str(),
p5.c_str(), p3.c_str()); p5.c_str(), p3.c_str());
code->appendf("\t\t%s = min(%s, %s);\n", tName.c_str(),
// y coord is 0.5 (texture is effectively 1D)
code->appendf("\t\t");
state->fSampleCoords.printf("vec2(%s, 0.5)", tName.c_str());
state->emitDefaultFetch(outputColor, samplerName);
// otherwise, if r(t) for the larger root was <= 0, try the other root
code->appendf("\t\t} else {\n");
code->appendf("\t\t\t%s = min(%s, %s);\n", tName.c_str(),
r0Name.c_str(), r1Name.c_str()); r0Name.c_str(), r1Name.c_str());
// if r(t) for the smaller root is also <= 0, set the fragment to // if r(t) > 0 for the smaller root, then t will be our x coordinate
// transparent black and return code->appendf("\t\t\tif (%s * %s + %s > 0.0) {\n",
code->appendf("\t\tif (%s * %s + %s <= 0.0) {\n\t\t\tgl_FragColor = "
"vec4(0.0,0.0,0.0,0.0);\n\t\t\treturn;\n\t\t}\n",
tName.c_str(), p5.c_str(), p3.c_str()); tName.c_str(), p5.c_str(), p3.c_str());
// y coord is 0.5 (texture is effectively 1D)
code->appendf("\t\t\t");
state->fSampleCoords.printf("vec2(%s, 0.5)", tName.c_str());
state->emitDefaultFetch(outputColor, samplerName);
// end if (r(t) > 0) for smaller root
code->appendf("\t\t\t}\n");
// end if (r(t) > 0), else, for larger root
code->appendf("\t\t}\n");
// end if (discriminant >= 0)
code->appendf("\t}\n"); code->appendf("\t}\n");
} else { } else {
@ -535,18 +554,15 @@ void GrGLConical2Gradient::emitFS(GrGLShaderBuilder* state,
code->appendf("\tfloat %s = -(%s / %s);\n", tName.c_str(), code->appendf("\tfloat %s = -(%s / %s);\n", tName.c_str(),
cName.c_str(), bVar.c_str()); cName.c_str(), bVar.c_str());
// set the fragment to transparent black and return if r(t) is <= 0 // if r(t) > 0, then t will be the x coordinate
code->appendf("\tif (%s * %s + %s <= 0.0) {\n\t\tgl_FragColor = vec4(" code->appendf("\tif (%s * %s + %s > 0.0) {\n", tName.c_str(),
"0.0,0.0,0.0,0.0);\n\t\treturn;\n\t}\n", tName.c_str(),
p5.c_str(), p3.c_str()); p5.c_str(), p3.c_str());
code->appendf("\t");
state->fSampleCoords.printf("vec2(%s, 0.5)", tName.c_str());
state->emitDefaultFetch(outputColor, samplerName);
code->appendf("\t}\n");
} }
state->fComplexCoord = true; state->fComplexCoord = true;
// x coord is: t
// y coord is 0.5 (texture is effectively 1D)
state->fSampleCoords.printf("\tvec2(%s, 0.5)", tName.c_str());
state->emitDefaultFetch(outputColor, samplerName);
} }
void GrGLConical2Gradient::initUniforms(const GrGLInterface* gl, int programID) { void GrGLConical2Gradient::initUniforms(const GrGLInterface* gl, int programID) {

2
src/gpu/gl/GrGLProgram.cpp
View File

@ -26,7 +26,7 @@ enum {
} // namespace } // namespace
#define PRINT_SHADERS GR_DEBUG #define PRINT_SHADERS 0
typedef GrGLProgram::ProgramDesc::StageDesc StageDesc; typedef GrGLProgram::ProgramDesc::StageDesc StageDesc;

2
src/gpu/gl/GrGpuGL.cpp
View File

@ -115,7 +115,7 @@ bool GrGpuGL::BlendCoeffReferencesConstant(GrBlendCoeff coeff) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
static bool gPrintStartupSpew = GR_DEBUG; static bool gPrintStartupSpew;
static bool fbo_test(const GrGLInterface* gl, int w, int h) { static bool fbo_test(const GrGLInterface* gl, int w, int h) {