diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-04 12:39:56 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-04 17:36:00 +0000 |
| commit | a4677b5db51fca9f2d1077a4d09dd8f7c80df3d1 (patch) | |
| tree | 0778cf68e2c83b24b49a5ec6d7c19d9944f6f196 /src/gpu/GrPipeline.h | |
| parent | cef018896e5cad8eb46a536b60cdf79ebe2b0191 (diff) | |
Make GrSimpleMeshDrawOpHelper consider blend barriers/dst textures for batching.
Change-Id: Idc6f924e39a08da9fb4b441a72c4d9caa76b0fe0
Reviewed-on: https://skia-review.googlesource.com/15312
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrPipeline.h')
| -rw-r--r-- | src/gpu/GrPipeline.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index 7fa42d0b8a..e0c85d3f4d 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -14,6 +14,7 @@ #include "GrPendingProgramElement.h" #include "GrProcessorSet.h" #include "GrProgramDesc.h" +#include "GrRect.h" #include "GrScissorState.h" #include "GrUserStencilSettings.h" #include "GrWindowRectsState.h" @@ -123,10 +124,7 @@ public: return false; } if (a.xferBarrierType(caps)) { - return aBounds.fRight <= bBounds.fLeft || - aBounds.fBottom <= bBounds.fTop || - bBounds.fRight <= aBounds.fLeft || - bBounds.fBottom <= aBounds.fTop; + return !GrRectsTouchOrOverlap(aBounds, bBounds); } return true; } |