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

Remove rect clip type from grclip.

Browse Source 
R=joshualitt@google.com
BUG=skia:
NOTREECHECKS=true

Review URL: https://codereview.chromium.org/989443003
This commit is contained in:
bsalomon 2015-03-06 08:21:38 -08:00 committed by Commit bot
parent a9d9a39238
commit bb3be25a86
3 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/gpu/GrClip.h
View File

@ -34,9 +34,12 @@ public:
fClip.fIRect = rect;
}
GrClip(const SkRect& rect) : fClipType(kRect_ClipType) {
GrClip(const SkRect& rect) : fClipType(kIRect_ClipType) {
fOrigin.setZero();
fClip.fRect = rect;
fClip.fIRect.fLeft = SkScalarRoundToInt(rect.fLeft);
fClip.fIRect.fTop = SkScalarRoundToInt(rect.fTop);
fClip.fIRect.fRight = SkScalarRoundToInt(rect.fRight);
fClip.fIRect.fBottom = SkScalarRoundToInt(rect.fBottom);
}
~GrClip() { this->reset(); }
@ -56,10 +59,6 @@ public:
fClip.fIRect = other.irect();
fOrigin.setZero();
break;
case kRect_ClipType:
fClip.fRect = other.rect();
fOrigin.setZero();
break;
}
return *this;
}
@ -86,9 +85,6 @@ public:
case kIRect_ClipType:
return this->irect() == other.irect();
break;
case kRect_ClipType:
return this->rect() == other.rect();
break;
}
}
@ -122,11 +118,6 @@ public:
return fClip.fIRect;
}
const SkRect& rect() const {
SkASSERT(kRect_ClipType == fClipType);
return fClip.fRect;
}
void reset() {
if (kClipStack_ClipType == fClipType) {
fClip.fStack->unref();
@ -146,15 +137,13 @@ public:
bool isWideOpen(const SkRect& rect) const {
return (kWideOpen_ClipType == fClipType) ||
(kClipStack_ClipType == fClipType && this->clipStack()->isWideOpen()) ||
(kIRect_ClipType == fClipType && this->irect().contains(rect)) ||
(kRect_ClipType == fClipType && this->rect().contains(rect));
(kIRect_ClipType == fClipType && this->irect().contains(rect));
}
bool isWideOpen(const SkIRect& rect) const {
return (kWideOpen_ClipType == fClipType) ||
(kClipStack_ClipType == fClipType && this->clipStack()->isWideOpen()) ||
(kIRect_ClipType == fClipType && this->irect().contains(rect)) ||
(kRect_ClipType == fClipType && this->rect().contains(rect));
(kIRect_ClipType == fClipType && this->irect().contains(rect));
}
bool isWideOpen() const {
@ -165,8 +154,7 @@ public:
bool quickContains(const SkRect& rect) const {
return (kWideOpen_ClipType == fClipType) ||
(kClipStack_ClipType == fClipType && this->clipStack()->quickContains(rect)) ||
(kIRect_ClipType == fClipType && this->irect().contains(rect)) ||
(kRect_ClipType == fClipType && this->rect().contains(rect));
(kIRect_ClipType == fClipType && this->irect().contains(rect));
}
void getConservativeBounds(const GrSurface* surface,
@ -186,7 +174,6 @@ public:
kClipStack_ClipType,
kWideOpen_ClipType,
kIRect_ClipType,
kRect_ClipType,
};
ClipType clipType() const { return fClipType; }
@ -194,7 +181,6 @@ public:
private:
union Clip {
const SkClipStack* fStack;
SkRect fRect;
SkIRect fIRect;
} fClip;

9
src/gpu/GrClip.cpp
View File

@ -33,15 +33,6 @@ void GrClip::getConservativeBounds(int width, int height, SkIRect* devResult,
*isIntersectionOfRects = true;
}
} break;
case kRect_ClipType: {
devResult->setLTRB(SkScalarCeilToInt(this->rect().fLeft),
SkScalarCeilToInt(this->rect().fTop),
SkScalarCeilToInt(this->rect().fRight),
SkScalarCeilToInt(this->rect().fBottom));
if (isIntersectionOfRects) {
*isIntersectionOfRects = true;
}
} break;
case kClipStack_ClipType: {
SkRect devBounds;
this->clipStack()->getConservativeBounds(-this->origin().fX,

10
src/gpu/GrClipMaskManager.cpp
View File

@ -244,16 +244,6 @@ bool GrClipMaskManager::setupClipping(GrPipelineBuilder* pipelineBuilder,
scissorState->set(clip.irect());
this->setPipelineBuilderStencil(pipelineBuilder, ars);
return true;
case GrClip::kRect_ClipType: {
const SkRect& rect = clip.rect();
SkIRect scissor;
scissor.fLeft = SkScalarRoundToInt(rect.fLeft);
scissor.fTop = SkScalarRoundToInt(rect.fTop);
scissor.fRight = SkScalarRoundToInt(rect.fRight);
scissor.fBottom = SkScalarRoundToInt(rect.fBottom);
scissorState->set(scissor);
this->setPipelineBuilderStencil(pipelineBuilder, ars);
} return true;
case GrClip::kClipStack_ClipType: {
clipSpaceRTIBounds.offset(clip.origin());
GrReducedClip::ReduceClipStack(*clip.clipStack(),