aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/batches/GrRectBatchFactory.h
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@google.com>2015-08-17 07:20:58 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-17 07:20:58 -0700
commit29553b39bbfe55f2fad9028d5f4e823db7c99c22 (patch)
tree603a8023aa12691bd123c19c8796b5b160a9dc7e /src/gpu/batches/GrRectBatchFactory.h
parent0d4bcea0d570041434ac3de2df2bd9063138fdb5 (diff)
Revert of drawBitmapImage can batch across AA rects (patchset #5 id:80001 of https://codereview.chromium.org/1293543002/ )
Reason for revert: a follow up patch exposes a bug Original issue's description: > drawBitmapImage can batch across AA rects > > BUG=464835 > > Committed: https://skia.googlesource.com/skia/+/0d4bcea0d570041434ac3de2df2bd9063138fdb5 TBR=bsalomon@google.com,robertphillips@google.com,joshualitt@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=464835 Review URL: https://codereview.chromium.org/1291663005
Diffstat (limited to 'src/gpu/batches/GrRectBatchFactory.h')
-rw-r--r--src/gpu/batches/GrRectBatchFactory.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/gpu/batches/GrRectBatchFactory.h b/src/gpu/batches/GrRectBatchFactory.h
index 5a43a34214..7eaec795e8 100644
--- a/src/gpu/batches/GrRectBatchFactory.h
+++ b/src/gpu/batches/GrRectBatchFactory.h
@@ -23,10 +23,10 @@ class SkStrokeRec;
namespace GrRectBatchFactory {
inline GrDrawBatch* CreateFillBW(GrColor color,
- const SkMatrix& viewMatrix,
- const SkRect& rect,
- const SkRect* localRect,
- const SkMatrix* localMatrix) {
+ const SkMatrix& viewMatrix,
+ const SkRect& rect,
+ const SkRect* localRect,
+ const SkMatrix* localMatrix) {
return GrBWFillRectBatch::Create(color, viewMatrix, rect, localRect, localMatrix);
}
@@ -37,14 +37,6 @@ inline GrDrawBatch* CreateFillAA(GrColor color,
return GrAAFillRectBatch::Create(color, viewMatrix, rect, devRect);
}
-inline GrDrawBatch* CreateFillAA(GrColor color,
- const SkMatrix& viewMatrix,
- const SkMatrix& localMatrix,
- const SkRect& rect,
- const SkRect& devRect) {
- return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
-}
-
GrDrawBatch* CreateStrokeBW(GrColor color,
const SkMatrix& viewMatrix,
const SkRect& rect,