diff options
| author |  joshualitt <joshualitt@google.com> | 2015-05-27 10:39:56 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-27 10:39:56 -0700 |
| commit | d8e2d289136df4d52ea969500526cc2ecc9be4cb (patch) | |
| tree | bff92d169232bb6a2492688cf7e56fedf953e12c | |
| parent | b72ec98b2090e5728354dac66eb1886a28e4da6b (diff) | |
Revert of Fall back to older inorder buffer if we have NVPR (patchset #3 id:40001 of https://codereview.chromium.org/1143153008/)
Reason for revert:
breaking bots
Original issue's description:
> Fall back to older inorder buffer if we have NVPR
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b72ec98b2090e5728354dac66eb1886a28e4da6b
TBR=bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1160663006
| -rw-r--r-- | src/gpu/GrInOrderDrawBuffer.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp index 0d838e1db1..3827830de9 100644 --- a/src/gpu/GrInOrderDrawBuffer.cpp +++ b/src/gpu/GrInOrderDrawBuffer.cpp @@ -7,16 +7,11 @@ #include "GrInOrderDrawBuffer.h" -// We will use the reordering buffer, unless we have NVPR. -// TODO move NVPR to batch so we can reorder -static inline bool allow_reordering(const GrShaderCaps* caps) { - return !caps->pathRenderingSupport(); -} +static const bool kEnableReordering = true; GrInOrderDrawBuffer::GrInOrderDrawBuffer(GrContext* context) : INHERITED(context) - , fCommands(GrCommandBuilder::Create(context->getGpu(), - allow_reordering(context->getGpu()->caps()->shaderCaps()))) + , fCommands(GrCommandBuilder::Create(context->getGpu(), kEnableReordering)) , fPathIndexBuffer(kPathIdxBufferMinReserve * sizeof(char)/4) , fPathTransformBuffer(kPathXformBufferMinReserve * sizeof(float)/4) , fPipelineBuffer(kPipelineBufferMinReserve) |