Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / gl / GrGLProgramDesc.cpp

diff --git a/src/third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp b/src/third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp
index d958742..b6029fe 100644 (file)
--- a/src/third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/src/third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp
@@ -105,7 +105,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState,
         memset(desc->header(), 0, kHeaderSize);
     }
     // write the key length
-    *desc->atOffset<uint32_t, kLengthOffset>() = newKeyLength;
+    *desc->atOffset<uint32_t, kLengthOffset>() = SkToU32(newKeyLength);
 
     KeyHeader* header = desc->header();
     EffectKey* effectKeys = desc->effectKeys();
@@ -156,7 +156,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState,
         header->fHasVertexCode = true;
     }
 
-    bool covIsSolidWhite = !requiresCoverageAttrib && 0xffffffff == drawState.getCoverage();
+    bool covIsSolidWhite = !requiresCoverageAttrib && 0xffffffff == drawState.getCoverageColor();
 
     if (skipCoverage) {
         header->fCoverageInput = kTransBlack_ColorInput;
@@ -215,8 +215,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState,
 
     // Here we deal with whether/how we handle color and coverage separately.
 
-    // Set these defaults and then possibly change our mind if there is coverage.
-    header->fDiscardIfZeroCoverage = false;
+    // Set this default and then possibly change our mind if there is coverage.
     header->fCoverageOutput = kModulate_CoverageOutput;
 
     // If we do have coverage determine whether it matters.
@@ -224,12 +223,6 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState,
     if (!drawState.isCoverageDrawing() && !skipCoverage &&
         (drawState.numCoverageStages() > 0 || requiresCoverageAttrib)) {
 
-        // If we're stenciling then we want to discard samples that have zero coverage
-        if (drawState.getStencil().doesWrite()) {
-            header->fDiscardIfZeroCoverage = true;
-            separateCoverageFromColor = true;
-        }
-
         if (gpu->caps()->dualSourceBlendingSupport() &&
             !(blendOpts & (GrDrawState::kEmitCoverage_BlendOptFlag |
                            GrDrawState::kCoverageAsAlpha_BlendOptFlag))) {