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

Use GrConvexPolyEffect when clip is a single convex polygon

Browse Source 
BUG=skia:2051

Committed: http://code.google.com/p/skia/source/detail?r=13286

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/151523005

git-svn-id: http://skia.googlecode.com/svn/trunk@13306 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-02-04 17:49:48 +00:00
parent d52a99703b
commit 65ee5f424c
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
expectations/gm/ignored-tests.txt
View File

@ -31,4 +31,7 @@
## Added by epoger as part of MADE-UP BUG
## https://code.google.com/p/skia/issues/detail?id=123456 : ignoring failures on
## gradtext GM test
#gradtext
#gradtext
# Added by bsalomon for skbug.com/2051, https://codereview.chromium.org/151523005
filltypespersp

29
src/gpu/GrClipMaskManager.cpp
View File

@ -18,6 +18,7 @@
#include "GrStencilBuffer.h"
#include "GrSWMaskHelper.h"
#include "effects/GrTextureDomain.h"
#include "effects/GrConvexPolyEffect.h"
#include "SkRasterClip.h"
#include "SkStrokeRec.h"
#include "SkTLazy.h"
@ -153,9 +154,33 @@ bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn,
return true;
}
#if GR_AA_CLIP
// TODO: catch isRect && requiresAA and use clip planes if available rather than a mask.
// If there is only one clip element and it is a convex polygon we just install an effect that
// clips against the edges.
if (1 == elements.count() && SkClipStack::Element::kPath_Type == elements.tail()->getType() &&
SkRegion::kReplace_Op == elements.tail()->getOp()) {
const SkPath& p = elements.tail()->getPath();
bool isAA = GR_AA_CLIP && elements.tail()->isAA();
SkAutoTUnref<GrEffectRef> effect;
if (rt->isMultisampled()) {
// A coverage effect for AA clipping won't play nicely with MSAA.
if (!isAA) {
effect.reset(GrConvexPolyEffect::Create(GrConvexPolyEffect::kFillNoAA_EdgeType, p));
}
} else {
GrConvexPolyEffect::EdgeType type = isAA ? GrConvexPolyEffect::kFillAA_EdgeType :
GrConvexPolyEffect::kFillNoAA_EdgeType;
effect.reset(GrConvexPolyEffect::Create(type, p));
}
if (effect) {
are->set(fGpu->drawState());
fGpu->drawState()->addCoverageEffect(effect);
fGpu->disableScissor();
this->setGpuStencil();
return true;
}
}
#if GR_AA_CLIP
// If MSAA is enabled we can do everything in the stencil buffer.
if (0 == rt->numSamples() && requiresAA) {
GrTexture* result = NULL;

2
src/gpu/effects/GrConvexPolyEffect.cpp
View File

@ -174,7 +174,7 @@ GrEffectRef* GrConvexPolyEffect::TestCreate(SkRandom* random,
const GrDrawTargetCaps& caps,
GrTexture*[]) {
EdgeType edgeType = static_cast<EdgeType>(random->nextULessThan(kEdgeTypeCnt));
int count = random->nextULessThan(kMaxEdges + 1);
int count = random->nextULessThan(kMaxEdges) + 1;
SkScalar edges[kMaxEdges * 3];
for (int i = 0; i < 3 * count; ++i) {
edges[i] = random->nextSScalar1();

1
tests/GLProgramsTest.cpp
View File

@ -173,6 +173,7 @@ bool GrGpuGL::programUnitTest(int maxStages) {
this->getContext(),
*this->caps(),
dummyTextures));
SkASSERT(effect);
int numAttribs = (*effect)->numVertexAttribs();
// If adding this effect would exceed the max attrib count then generate a