Extract GrDrawTarget::DrState into independent GrDrawState struct.
This is intended to be a first step towards making the stack of states
maintained by GrDrawTarget cheaper to maintain.
git-svn-id: http://skia.googlecode.com/svn/trunk@2544 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
index 5e3c769..db20846 100644
--- a/src/gpu/GrInOrderDrawBuffer.cpp
+++ b/src/gpu/GrInOrderDrawBuffer.cpp
@@ -324,8 +324,8 @@
this->resetIndexSource();
uint32_t numStates = fStates.count();
for (uint32_t i = 0; i < numStates; ++i) {
- const DrState& dstate = this->accessSavedDrawState(fStates[i]);
- for (int s = 0; s < kNumStages; ++s) {
+ const GrDrawState& dstate = this->accessSavedDrawState(fStates[i]);
+ for (int s = 0; s < GrDrawState::kNumStages; ++s) {
GrSafeUnref(dstate.fTextures[s]);
}
GrSafeUnref(dstate.fRenderTarget);
@@ -585,13 +585,13 @@
if (fStates.empty()) {
return true;
} else {
- const DrState& old = this->accessSavedDrawState(fStates.back());
+ const GrDrawState& old = this->accessSavedDrawState(fStates.back());
return old != fCurrDrawState;
}
}
void GrInOrderDrawBuffer::pushState() {
- for (int s = 0; s < kNumStages; ++s) {
+ for (int s = 0; s < GrDrawState::kNumStages; ++s) {
GrSafeRef(fCurrDrawState.fTextures[s]);
}
GrSafeRef(fCurrDrawState.fRenderTarget);