diff options
Diffstat (limited to 'src/gpu/gl/GrGLProgramDesc.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLProgramDesc.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index 27a1fab1e0..e1a319104d 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -66,6 +66,7 @@ bool GrGLProgramDesc::Build(const GrDrawState& drawState, bool skipColor = SkToBool(blendOpts & (GrDrawState::kEmitTransBlack_BlendOptFlag | GrDrawState::kEmitCoverage_BlendOptFlag)); + int firstEffectiveColorStage = 0; bool inputColorIsUsed = true; if (!skipColor) { @@ -99,11 +100,6 @@ bool GrGLProgramDesc::Build(const GrDrawState& drawState, bool requiresLocalCoordAttrib = !(skipCoverage && skipColor) && drawState.hasLocalCoordAttribute(); - bool colorIsTransBlack = SkToBool(blendOpts & GrDrawState::kEmitTransBlack_BlendOptFlag); - bool colorIsSolidWhite = (blendOpts & GrDrawState::kEmitCoverage_BlendOptFlag) || - (!requiresColorAttrib && 0xffffffff == drawState.getColor()) || - (!inputColorIsUsed); - bool readsDst = false; bool readFragPosition = false; // We use vertexshader-less shader programs only when drawing paths. @@ -192,11 +188,7 @@ bool GrGLProgramDesc::Build(const GrDrawState& drawState, #endif bool defaultToUniformInputs = GR_GL_NO_CONSTANT_ATTRIBUTES || gpu->caps()->pathRenderingSupport(); - if (colorIsTransBlack) { - header->fColorInput = kTransBlack_ColorInput; - } else if (colorIsSolidWhite) { - header->fColorInput = kSolidWhite_ColorInput; - } else if (defaultToUniformInputs && !requiresColorAttrib) { + if (defaultToUniformInputs && !requiresColorAttrib && inputColorIsUsed) { header->fColorInput = kUniform_ColorInput; } else { header->fColorInput = kAttribute_ColorInput; @@ -205,11 +197,9 @@ bool GrGLProgramDesc::Build(const GrDrawState& drawState, bool covIsSolidWhite = !requiresCoverageAttrib && 0xffffffff == drawState.getCoverageColor(); - if (skipCoverage) { - header->fCoverageInput = kTransBlack_ColorInput; - } else if (covIsSolidWhite || !inputCoverageIsUsed) { + if ((covIsSolidWhite || !inputCoverageIsUsed) && !skipCoverage) { header->fCoverageInput = kSolidWhite_ColorInput; - } else if (defaultToUniformInputs && !requiresCoverageAttrib) { + } else if (defaultToUniformInputs && !requiresCoverageAttrib && inputCoverageIsUsed) { header->fCoverageInput = kUniform_ColorInput; } else { header->fCoverageInput = kAttribute_ColorInput; |