diff options
| author |  joshualitt <joshualitt@google.com> | 2015-01-28 06:54:30 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-28 06:54:30 -0800 |
| commit | c2893c5e3870d7e9a37ca146e7da88fba54977d5 (patch) | |
| tree | 9efd98166a608e5ae24d35ab0dde1c7cb9b763b3 /src/gpu/GrDrawTarget.cpp | |
| parent | 8b0a05ae44911f9263be5936457b66a967b8a1fc (diff) | |
Revert of GrBatchPrototype (patchset #32 id:630001 of https://codereview.chromium.org/845103005/)
Reason for revert:
One last try to fix mac perf regression
Original issue's description:
> GrBatchPrototype
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d15e4e45374275c045572b304c229237c4a82be4
>
> Committed: https://skia.googlesource.com/skia/+/d5a7db4a867c7e6ccf8451a053d987b470099198
TBR=bsalomon@google.com,kkinnunen@nvidia.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/877393002
Diffstat (limited to 'src/gpu/GrDrawTarget.cpp')
| -rw-r--r-- | src/gpu/GrDrawTarget.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp index b89d70ea2b..e8a758d25f 100644 --- a/src/gpu/GrDrawTarget.cpp +++ b/src/gpu/GrDrawTarget.cpp @@ -6,9 +6,9 @@ * found in the LICENSE file. */ -#include "GrDrawTarget.h" -#include "GrBatch.h" + +#include "GrDrawTarget.h" #include "GrContext.h" #include "GrDrawTargetCaps.h" #include "GrPath.h" @@ -526,29 +526,6 @@ void GrDrawTarget::drawNonIndexed(GrPipelineBuilder* pipelineBuilder, } } - -void GrDrawTarget::drawBatch(GrPipelineBuilder* pipelineBuilder, - GrBatch* batch, - const SkRect* devBounds) { - SkASSERT(pipelineBuilder); - // TODO some kind of checkdraw, but not at this level - - // Setup clip - GrScissorState scissorState; - GrPipelineBuilder::AutoRestoreEffects are; - GrPipelineBuilder::AutoRestoreStencil ars; - if (!this->setupClip(pipelineBuilder, &are, &ars, &scissorState, devBounds)) { - return; - } - - GrDeviceCoordTexture dstCopy; - if (!this->setupDstReadIfNecessary(pipelineBuilder, &dstCopy, devBounds)) { - return; - } - - this->onDrawBatch(batch, *pipelineBuilder, scissorState, dstCopy.texture() ? &dstCopy : NULL); -} - static const GrStencilSettings& winding_path_stencil_settings() { GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings, kIncClamp_StencilOp, |