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

Unified Diff: src/gpu/GrClipMaskManager.cpp

Issue 866403005: Stop incorrectly setting the clip bit in GrCMM (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 11 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 6bfdba6cce17ef5e11902f2258c8ae943ee3b583..0226ac1b764076786112c3ad5acc279207969082 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();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698