diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-26 20:22:11 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-26 20:22:11 +0000 |
| commit | a47a48dca5045d71cbc5de343404045209a13e15 (patch) | |
| tree | 59f7c328c3667bdb73bcadbc74dcf1b78f9482d6 /gpu/src/GrGpuGLFixed.cpp | |
| parent | 2adc557b0f769d006af0e82659b3bbc5de4c9dc3 (diff) | |
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
Diffstat (limited to 'gpu/src/GrGpuGLFixed.cpp')
| -rw-r--r-- | gpu/src/GrGpuGLFixed.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gpu/src/GrGpuGLFixed.cpp b/gpu/src/GrGpuGLFixed.cpp index 446949f1c2..4440bcdd85 100644 --- a/gpu/src/GrGpuGLFixed.cpp +++ b/gpu/src/GrGpuGLFixed.cpp @@ -127,8 +127,7 @@ bool GrGpuGLFixed::flushGraphicsState(GrPrimitiveType type) { 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 @@ bool GrGpuGLFixed::flushGraphicsState(GrPrimitiveType type) { } 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]) { |