Start removing calls to GrDrawState::setTexture()

Now the current CustomStage objects aren't using the texture array on the GrPaint.

[TomH, 2012-07-13 16:37:35]

GrContext-set custom stages work, but SkGpuDevice-set custom stages don't (when
we set the GrPaint's textures directly to NULL).
GrContext::setPaint() calls getTexture() more times when the texture is
non-NULL, but that's a side effect of ASSERT_OWNED_RESOURCE().

[TomH, 2012-07-13 17:23:37]

DrawTarget::srcAlphaWillBeOne() detects an enabled stage when the GrPaint
texture is set, but not when it isn't.

[TomH, 2012-07-13 18:51:35]

Ready for review.

[bsalomon, 2012-07-13 18:59:25]

I think you also want to remove the setTexture in apply_custom_stage in
SkGpuDevice.cpp

http://codereview.appspot.com/6353094/diff/4001/src/gpu/SkGpuDevice.cpp
File src/gpu/SkGpuDevice.cpp (right):

http://codereview.appspot.com/6353094/diff/4001/src/gpu/SkGpuDevice.cpp#newco...
src/gpu/SkGpuDevice.cpp:565: grPaint->setTexture(kShaderTextureIdx, NULL);
Is this necessary?

http://codereview.appspot.com/6353094/diff/4001/src/gpu/gl/GrGpuGL.cpp
File src/gpu/gl/GrGpuGL.cpp (right):

http://codereview.appspot.com/6353094/diff/4001/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:2148: GrAssert(!nextTexture || nextTexture ==
customStage->texture(0));
Should we assert numTextures() is 1?

Should we ever now have the same value in nextTexture and
customStage->texture(0) or should one or the other always be NULL?

[TomH, 2012-07-13 19:48:48]

http://codereview.appspot.com/6353094/diff/4001/src/gpu/SkGpuDevice.cpp
File src/gpu/SkGpuDevice.cpp (right):

http://codereview.appspot.com/6353094/diff/4001/src/gpu/SkGpuDevice.cpp#newco...
src/gpu/SkGpuDevice.cpp:565: grPaint->setTexture(kShaderTextureIdx, NULL);
On 2012/07/13 18:59:26, bsalomon wrote:
> Is this necessary?

Done.

http://codereview.appspot.com/6353094/diff/4001/src/gpu/gl/GrGpuGL.cpp
File src/gpu/gl/GrGpuGL.cpp (right):

http://codereview.appspot.com/6353094/diff/4001/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:2148: GrAssert(!nextTexture || nextTexture ==
customStage->texture(0));
Patch set 3 gets rid of this code.

http://codereview.appspot.com/6353094/diff/9001/src/gpu/gl/GrGpuGL.cpp
File src/gpu/gl/GrGpuGL.cpp (left):

http://codereview.appspot.com/6353094/diff/9001/src/gpu/gl/GrGpuGL.cpp#oldcod...
src/gpu/gl/GrGpuGL.cpp:2143: // HACK - if we're using a new SingleTextureEffect,
override
Given the change made to GrDrawState::getTexture(), this whole HACK clause
becomes unnecessary.

[bsalomon, 2012-07-13 19:51:17]

LGTM, If the answer is "yes" then let's make sure he is aware.

http://codereview.appspot.com/6353094/diff/4001/src/gpu/GrDrawState.h
File src/gpu/GrDrawState.h (right):

http://codereview.appspot.com/6353094/diff/4001/src/gpu/GrDrawState.h#newcode215
src/gpu/GrDrawState.h:215: if (!fTextures[stage] &&
this->getSampler(stage).getCustomStage()) {
Does Jeff now have to either subclass GrSingleTextureEffect do his own texture
management?

[TomH, 2012-07-13 19:54:53]

Committed as r4608.

(And warned Jeff via chat, as well as CCing him here.)