Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1658)

Issue 6306104: Add GrPaint::*StageEnabled() and GrDrawState::stageEnabled() functions (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
12 years, 5 months ago by TomH
Modified:
12 years, 5 months ago
Base URL:
http://skia.googlecode.com/svn/trunk/
Visibility:
Public.

Description

We now consider a stage to be active if it has a GrTexture *OR* a GrCustomStage/GrGLProgramStage. This change prepares us for http://codereview.appspot.com/6306097/, which moves the GrTexture *onto* the GrCustomStage; that in turn sets us up for zero- and multi-texture effects. DEPENDS (probably) on robertphillips@'s change to reset textures + some follow-on work to get rid of half of the vertex layout bits: a stage should default to using positions as texture coordinates.

Patch Set 1 #

Patch Set 2 : Remember to call maskStageActive() #

Patch Set 3 : Add GrDrawState::stageActive() #

Patch Set 4 : Call GrDrawState::stageActive() from GrDrawTarget::StageWillBeUsed() #

Patch Set 5 : Why look, the static function is gone! #

Total comments: 6

Patch Set 6 : More isEnabled() #

Unified diffs Side-by-side diffs Delta from patch set Stats (+31 lines, -19 lines) Patch
M include/gpu/GrPaint.h View 1 2 3 4 5 2 chunks +12 lines, -0 lines 0 comments Download
M src/gpu/GrContext.cpp View 1 2 3 4 5 3 chunks +5 lines, -5 lines 0 comments Download
M src/gpu/GrDefaultTextContext.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/GrDrawState.h View 1 2 3 4 5 2 chunks +7 lines, -1 line 0 comments Download
M src/gpu/GrDrawTarget.h View 1 2 3 4 5 1 chunk +1 line, -7 lines 0 comments Download
M src/gpu/GrDrawTarget.cpp View 1 2 3 4 2 chunks +2 lines, -2 lines 0 comments Download
M src/gpu/SkGpuDevice.cpp View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download

Messages

Total messages: 9
TomH
12 years, 5 months ago (2012-06-20 17:54:25 UTC) #1
TomH
Now with more complete coverage *and* notes about why we can't commit it. Yet.
12 years, 5 months ago (2012-06-20 18:18:22 UTC) #2
TomH
OK, resetting textures & stages landed in r4313, and we didn't note *why* we care ...
12 years, 5 months ago (2012-06-22 20:19:45 UTC) #3
TomH
Answer: there are a few call sites which are currently: enabled if non-NULL texture AND ...
12 years, 5 months ago (2012-06-22 20:30:32 UTC) #4
TomH
Vert layout fix landed. This should be clean now? Or am I still missing something?
12 years, 5 months ago (2012-06-25 15:41:14 UTC) #5
bsalomon
Mostly LGTM. Let's choose either "active" or "enabled" and stick with it. I don't care ...
12 years, 5 months ago (2012-06-25 15:48:09 UTC) #6
TomH
This should be fairly consistent with is*Enabled(). http://codereview.appspot.com/6306104/diff/15001/src/gpu/GrContext.cpp File src/gpu/GrContext.cpp (right): http://codereview.appspot.com/6306104/diff/15001/src/gpu/GrContext.cpp#newcode1595 src/gpu/GrContext.cpp:1595: if (paint.textureStageActive(i)) ...
12 years, 5 months ago (2012-06-25 17:20:18 UTC) #7
bsalomon
On 2012/06/25 17:20:18, TomH wrote: > This should be fairly consistent with is*Enabled(). > > ...
12 years, 5 months ago (2012-06-25 17:24:34 UTC) #8
TomH
12 years, 5 months ago (2012-06-25 17:28:24 UTC) #9
Closed with r4325.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b