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