diff options
| author |  egdaniel <egdaniel@google.com> | 2015-02-04 06:20:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-04 06:20:25 -0800 |
| commit | 7adb35559430303a25be37f21af56c0df6c62f2b (patch) | |
| tree | 136bfed094f7bd15de972a059402c83f98891b23 /src/gpu/GrInOrderDrawBuffer.h | |
| parent | 3e9dfdb3784c0cbfecf7589a74aa9aff7ef40abd (diff) | |
Revert of Revert "Move DstCopy on gpu into the GrXferProcessor." (patchset #1 id:1 of https://codereview.chromium.org/896163003/)
Reason for revert:
failed on my manual revert
Original issue's description:
> Revert "Move DstCopy on gpu into the GrXferProcessor."
>
> This reverts commit 74a11753604768bf461b80cabb66060e8564d82c.
>
> TBR=joshualitt@google.com,bsalomon@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3e9dfdb3784c0cbfecf7589a74aa9aff7ef40abd
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/900913002
Diffstat (limited to 'src/gpu/GrInOrderDrawBuffer.h')
| -rw-r--r-- | src/gpu/GrInOrderDrawBuffer.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h index bf9237d426..3d1bd7c43e 100644 --- a/src/gpu/GrInOrderDrawBuffer.h +++ b/src/gpu/GrInOrderDrawBuffer.h @@ -233,12 +233,11 @@ private: void onDraw(const GrPipelineBuilder&, const GrGeometryProcessor*, const DrawInfo&, - const GrScissorState&, - const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE; + const GrScissorState&) SK_OVERRIDE; void onDrawBatch(GrBatch*, const GrPipelineBuilder&, const GrScissorState&, - const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE; + const SkRect* devBounds) SK_OVERRIDE; void onDrawRect(GrPipelineBuilder*, GrColor, const SkMatrix& viewMatrix, @@ -256,7 +255,7 @@ private: const GrPath*, const GrScissorState&, const GrStencilSettings&, - const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE; + const SkRect* devBounds) SK_OVERRIDE; void onDrawPaths(const GrPipelineBuilder&, const GrPathProcessor*, const GrPathRange*, @@ -267,7 +266,7 @@ private: int count, const GrScissorState&, const GrStencilSettings&, - const GrDeviceCoordTexture*) SK_OVERRIDE; + const SkRect* devBounds) SK_OVERRIDE; void onClear(const SkIRect* rect, GrColor color, bool canIgnoreRect, @@ -288,11 +287,11 @@ private: bool SK_WARN_UNUSED_RESULT recordStateAndShouldDraw(const GrPipelineBuilder&, const GrPrimitiveProcessor*, const GrScissorState&, - const GrDeviceCoordTexture*); + const SkRect*); bool SK_WARN_UNUSED_RESULT recordStateAndShouldDraw(GrBatch*, const GrPipelineBuilder&, const GrScissorState&, - const GrDeviceCoordTexture*); + const SkRect*); // We lazily record clip changes in order to skip clips that have no effect. void recordClipIfNecessary(); |