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

Remove default clip/drawstate in GrIODB.

Browse Source 
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7070064

git-svn-id: http://skia.googlecode.com/svn/trunk@7114 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2013-01-10 14:40:28 +00:00
parent e04cf0cf1d
commit 358e427763
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gpu/GrInOrderDrawBuffer.cpp
View File

@ -551,12 +551,6 @@ void GrInOrderDrawBuffer::reset() {
fClipSet = true;
this->resetDrawTracking();
// we start off with a default clip and state so that we don't have
// to do count checks on fClips, fStates, or fCmds before checking their
// last entry.
this->recordDefaultState();
this->recordDefaultClip();
}
bool GrInOrderDrawBuffer::playback(GrDrawTarget* target) {
@ -567,10 +561,7 @@ bool GrInOrderDrawBuffer::playback(GrDrawTarget* target) {
GrAssert(target != this); // not considered and why?
int numCmds = fCmds.count();
GrAssert(numCmds >= 2);
if (2 == numCmds) {
GrAssert(kSetState_Cmd == fCmds[0]);
GrAssert(kSetClip_Cmd == fCmds[1]);
if (0 == numCmds) {
return false;
}
@ -868,15 +859,15 @@ void GrInOrderDrawBuffer::geometrySourceWillPop(
}
bool GrInOrderDrawBuffer::needsNewState() const {
// we should have recorded a default state in reset()
GrAssert(!fStates.empty());
return fStates.back() != this->getDrawState();
return fStates.empty() || fStates.back() != this->getDrawState();
}
bool GrInOrderDrawBuffer::needsNewClip() const {
if (this->getDrawState().isClipState()) {
GrAssert(fClips.count() == fClipOrigins.count());
if (this->getDrawState().isClipState()) {
if (fClipSet &&
(fClips.back() != *fClip->fClipStack ||
(fClips.empty() ||
fClips.back() != *fClip->fClipStack ||
fClipOrigins.back() != fClip->fOrigin)) {
return true;
}