aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-01-26 11:19:16 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-26 11:19:16 -0800
commit356be2ed89c7dfc06f756e2e1efe44847dd17db4 (patch)
tree7542dfb7477c4825c8a08a8827d65739a4e342b4 /src
parentc12b74dc413ef024b13e0ed478491c4b1bafe6b1 (diff)
Stop incorrectly setting the clip bit in GrCMM
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrClipMaskManager.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 6bfdba6cce..0226ac1b76 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -568,7 +568,6 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
bool invert = element->isInverseFilled();
if (invert || SkRegion::kIntersect_Op == op || SkRegion::kReverseDifference_Op == op) {
GrPipelineBuilder pipelineBuilder;
- pipelineBuilder.enableState(GrPipelineBuilder::kClip_StateBit);
GrPathRenderer* pr = NULL;
bool useTemp = !this->canStencilAndDrawElement(&pipelineBuilder, result, &pr, element);
@@ -625,7 +624,6 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
if (useTemp) {
GrPipelineBuilder backgroundPipelineBuilder;
- backgroundPipelineBuilder.enableState(GrPipelineBuilder::kClip_StateBit);
backgroundPipelineBuilder.setRenderTarget(result->asRenderTarget());
// Now draw into the accumulator using the real operation and the temp buffer as a
@@ -638,7 +636,6 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
maskSpaceElementIBounds);
} else {
GrPipelineBuilder backgroundPipelineBuilder;
- backgroundPipelineBuilder.enableState(GrPipelineBuilder::kClip_StateBit);
backgroundPipelineBuilder.setRenderTarget(result->asRenderTarget());
set_coverage_drawing_xpf(op, !invert, &backgroundPipelineBuilder);
@@ -657,7 +654,6 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t elementsGenID,
}
} else {
GrPipelineBuilder pipelineBuilder;
- pipelineBuilder.enableState(GrPipelineBuilder::kClip_StateBit);
// all the remaining ops can just be directly draw into the accumulation buffer
set_coverage_drawing_xpf(op, false, &pipelineBuilder);
@@ -718,7 +714,6 @@ bool GrClipMaskManager::createStencilClipMask(GrRenderTarget* rt,
GrPipelineBuilder pipelineBuilder;
pipelineBuilder.setRenderTarget(rt);
- pipelineBuilder.enableState(GrPipelineBuilder::kClip_StateBit);
pipelineBuilder.setDisableColorXPFactory();