diff options
| author |  joshualitt <joshualitt@google.com> | 2014-12-04 06:01:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-04 06:01:45 -0800 |
| commit | f78c60c92a8c212fc462262f2ce81e584d0f02f8 (patch) | |
| tree | 33a43f1d293a54764399846c504d1506d2cbd9e0 /src/gpu/GrInOrderDrawBuffer.h | |
| parent | 841a6b54c11137e210aa81e8b56e1763c3571cb8 (diff) | |
Revert of move program descriptor generation to flush (patchset #7 id:120001 of https://codereview.chromium.org/777673003/)
Reason for revert:
breaking linux build
Original issue's description:
> move program descriptor generation to flush
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/829e1b80b1020b17f2078020c990e079b70c077c
TBR=egdaniel@google.com,bsalomon@google.com,joshualitt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/776243005
Diffstat (limited to 'src/gpu/GrInOrderDrawBuffer.h')
| -rw-r--r-- | src/gpu/GrInOrderDrawBuffer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h index 01e560ac08..532842a3b4 100644 --- a/src/gpu/GrInOrderDrawBuffer.h +++ b/src/gpu/GrInOrderDrawBuffer.h @@ -171,15 +171,15 @@ private: }; struct SetState : public Cmd { - SetState(const GrDrawState& drawState, const GrDrawTargetCaps& caps, - const ScissorState& scissor, const GrDeviceCoordTexture* dstCopy, - GrGpu::DrawType drawType) + SetState(const GrDrawState& drawState, GrGpu* gpu, const ScissorState& scissor, + const GrDeviceCoordTexture* dstCopy, GrGpu::DrawType drawType) : Cmd(kSetState_Cmd) - , fState(drawState, caps, scissor, dstCopy, drawType) {} + , fState(drawState, gpu, scissor, dstCopy, drawType) {} void execute(GrInOrderDrawBuffer*, const GrOptDrawState*) SK_OVERRIDE; - GrOptDrawState fState; + const GrOptDrawState fState; + GrGpu::DrawType fDrawType; }; typedef void* TCmdAlign; // This wouldn't be enough align if a command used long double. |