SSSA for drawVerts, cleanup determination of when stage is enabled
Review URL: http://codereview.appspot.com/4430066/
git-svn-id: http://skia.googlecode.com/svn/trunk@1195 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrGpuGLFixed.cpp b/gpu/src/GrGpuGLFixed.cpp
index 446949f..4440bcd 100644
--- a/gpu/src/GrGpuGLFixed.cpp
+++ b/gpu/src/GrGpuGLFixed.cpp
@@ -127,8 +127,7 @@
bool usingTextures[kNumStages];
for (int s = 0; s < kNumStages; ++s) {
- usingTextures[s] = VertexUsesStage(s, fGeometrySrc.fVertexLayout);
-
+ usingTextures[s] = this->isStageEnabled(s);
if (usingTextures[s] && fCurrDrawState.fSamplerStates[s].isGradient()) {
unimpl("Fixed pipe doesn't support radial/sweep gradients");
return false;
@@ -152,7 +151,7 @@
}
for (int s = 0; s < kNumStages; ++s) {
- bool wasUsingTexture = VertexUsesStage(s, fHWGeometryState.fVertexLayout);
+ bool wasUsingTexture = StageWillBeUsed(s, fHWGeometryState.fVertexLayout, fHWDrawState);
if (usingTextures[s] != wasUsingTexture) {
setTextureUnit(s);
if (usingTextures[s]) {