Revert "Update SkCanvas' experimental SkiaRenderer API"
This reverts commit 4bf964602ab8758f6e580aaaa69add4fb260c1a6.
Reason for revert: vulkan dm crashes
Original change's description:
> Update SkCanvas' experimental SkiaRenderer API
>
> This lifts the temporary functions in SkGpuDevice into SkCanvas and
> deprecates the older experimental_DrawImageSetV1 and
> experimental_DrawEdgeAARect. The new functions can handle paints and
> transform batching. Internally, SkCanvas routes the old functions to the
> new entry points and all device-level code is updated to handle the new
> API features.
>
> While touching all of the canvas/device/recording areas, the
> experimental functions are grouped in an "EdgeAA" cluster instead of being
> separated into the image category and the rectangle category.
>
> Bug: skia:8739
> Change-Id: I67c2a724873040ad5dc3307ab5b2823ba1eac54b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/190221
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com
Change-Id: I87a5a258c5a1bd15e16389cdf91743772d6fa98a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:8739
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201226
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index d23097c..8c280d5 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -454,9 +454,12 @@
// Otherwise don't know how to draw it
}
-void SkGpuDevice::drawEdgeAAImageSet(const SkCanvas::ImageSetEntry set[], int count,
- const SkPoint dstClips[], const SkMatrix preViewMatrices[],
- const SkPaint& paint, SkCanvas::SrcRectConstraint constraint) {
+// For ease-of-use, the temporary API treats null dstClipCounts as if it were the proper sized
+// array, filled with all 0s (so dstClips can be null too)
+void SkGpuDevice::tmp_drawImageSetV3(const SkCanvas::ImageSetEntry set[], int dstClipCounts[],
+ int preViewMatrixIdx[], int count, const SkPoint dstClips[],
+ const SkMatrix preViewMatrices[], const SkPaint& paint,
+ SkCanvas::SrcRectConstraint constraint) {
SkASSERT(count > 0);
if (!can_use_draw_texture(paint)) {
@@ -464,16 +467,19 @@
int dstClipIndex = 0;
for (int i = 0; i < count; ++i) {
// Only no clip or quad clip are supported
- SkASSERT(!set[i].fHasClip || dstClips);
- SkASSERT(set[i].fMatrixIndex < 0 || preViewMatrices);
+ SkASSERT(!dstClipCounts || dstClipCounts[i] == 0 || dstClipCounts[i] == 4);
+
+ int xform = preViewMatrixIdx ? preViewMatrixIdx[i] : -1;
+ SkASSERT(xform < 0 || preViewMatrices);
// Always send GrAA::kYes to preserve seaming across tiling in MSAA
this->drawImageQuad(set[i].fImage.get(), &set[i].fSrcRect, &set[i].fDstRect,
- set[i].fHasClip ? dstClips + dstClipIndex : nullptr,
+ (dstClipCounts && dstClipCounts[i] > 0) ? dstClips + dstClipIndex : nullptr,
GrAA::kYes, SkToGrQuadAAFlags(set[i].fAAFlags),
- set[i].fMatrixIndex < 0 ? nullptr : preViewMatrices + set[i].fMatrixIndex,
- paint, constraint);
- dstClipIndex += 4 * set[i].fHasClip;
+ xform < 0 ? nullptr : preViewMatrices + xform, paint, constraint);
+ if (dstClipCounts) {
+ dstClipIndex += dstClipCounts[i];
+ }
}
return;
}
@@ -500,10 +506,12 @@
for (int i = 0; i < count; ++i) {
// Manage the dst clip pointer tracking before any continues are used so we don't lose
// our place in the dstClips array.
- SkASSERT(!set[i].fHasClip || dstClips);
- const SkPoint* clip = set[i].fHasClip ? dstClips + dstClipIndex : nullptr;
- dstClipIndex += 4 * set[i].fHasClip;
-
+ int clipCount = (dstClipCounts ? dstClipCounts[i] : 0);
+ SkASSERT(clipCount == 0 || (dstClipCounts[i] == 4 && dstClips));
+ const SkPoint* clip = clipCount > 0 ? dstClips + dstClipIndex : nullptr;
+ if (dstClipCounts) {
+ dstClipIndex += dstClipCounts[i];
+ }
// The default SkBaseDevice implementation is based on drawImageRect which does not allow
// non-sorted src rects. TODO: Decide this is OK or make sure we handle it.
if (!set[i].fSrcRect.isSorted()) {
@@ -536,13 +544,13 @@
}
}
- SkASSERT(set[i].fMatrixIndex < 0 || preViewMatrices);
+ int xform = preViewMatrixIdx ? preViewMatrixIdx[i] : -1;
+ SkASSERT(xform < 0 || preViewMatrices);
textures[i].fSrcRect = set[i].fSrcRect;
textures[i].fDstRect = set[i].fDstRect;
textures[i].fDstClipQuad = clip;
- textures[i].fPreViewMatrix =
- set[i].fMatrixIndex < 0 ? nullptr : preViewMatrices + set[i].fMatrixIndex;
+ textures[i].fPreViewMatrix = xform < 0 ? nullptr : preViewMatrices + xform;
textures[i].fAlpha = set[i].fAlpha * paint.getAlphaf();
textures[i].fAAFlags = SkToGrQuadAAFlags(set[i].fAAFlags);