Remove SkCanvas::experimental_drawImageSetV0
Bug: skia:8563
Change-Id: I4421a19979a2a1ddae4ca52871c71e9d7d1220d8
Reviewed-on: https://skia-review.googlesource.com/c/172870
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 3da23c2..33c470a 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -830,7 +830,7 @@
}
void GrRenderTargetContext::drawTextureSet(const GrClip& clip, const TextureSetEntry set[], int cnt,
- GrSamplerState::Filter filter, float alpha,
+ GrSamplerState::Filter filter,
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> texXform) {
ASSERT_SINGLE_OWNER
@@ -838,8 +838,8 @@
SkDEBUGCODE(this->validate();)
GR_CREATE_TRACE_MARKER_CONTEXT("GrRenderTargetContext", "drawTextureSet", fContext);
GrAAType aaType = this->chooseAAType(GrAA::kYes, GrAllowMixedSamples::kNo);
- auto op = GrTextureOp::Make(fContext, set, cnt, filter, alpha, aaType, viewMatrix,
- std::move(texXform));
+ auto op =
+ GrTextureOp::Make(fContext, set, cnt, filter, aaType, viewMatrix, std::move(texXform));
this->addDrawOp(clip, std::move(op));
}
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index b26ff20..b4114f7 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -151,7 +151,7 @@
* texture color xform. The textures must all have the same GrTextureType and GrConfig.
*/
void drawTextureSet(const GrClip&, const TextureSetEntry[], int cnt, GrSamplerState::Filter,
- float alpha, const SkMatrix& viewMatrix, sk_sp<GrColorSpaceXform> texXform);
+ const SkMatrix& viewMatrix, sk_sp<GrColorSpaceXform> texXform);
/**
* Draw a roundrect using a paint.
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 66688bf..088d693 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1454,12 +1454,12 @@
this->drawProducerLattice(&maker, std::move(iter), dst, paint);
}
-void SkGpuDevice::drawImageSet(const SkCanvas::ImageSetEntry set[], int count, float alpha,
+void SkGpuDevice::drawImageSet(const SkCanvas::ImageSetEntry set[], int count,
SkFilterQuality filterQuality, SkBlendMode mode) {
SkASSERT(count > 0);
if (mode != SkBlendMode::kSrcOver ||
!fContext->contextPriv().caps()->dynamicStateArrayGeometryProcessorTextureSupport()) {
- INHERITED::drawImageSet(set, count, alpha, filterQuality, mode);
+ INHERITED::drawImageSet(set, count, filterQuality, mode);
return;
}
GrSamplerState sampler;
@@ -1475,7 +1475,7 @@
set[base].fImage->colorSpace(), set[base].fImage->alphaType(),
fRenderTargetContext->colorSpaceInfo().colorSpace(), kPremul_SkAlphaType);
fRenderTargetContext->drawTextureSet(this->clip(), textures.get() + base, n,
- sampler.filter(), alpha, this->ctm(),
+ sampler.filter(), this->ctm(),
std::move(textureXform));
}
};
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index ca2522f..dfc5fc7 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -105,7 +105,7 @@
const SkRect& dst, const SkPaint&) override;
void drawBitmapLattice(const SkBitmap&, const SkCanvas::Lattice&,
const SkRect& dst, const SkPaint&) override;
- void drawImageSet(const SkCanvas::ImageSetEntry[], int count, float alpha, SkFilterQuality,
+ void drawImageSet(const SkCanvas::ImageSetEntry[], int count, SkFilterQuality,
SkBlendMode) override;
void drawDrawable(SkDrawable*, const SkMatrix*, SkCanvas* canvas) override;
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 22ef9fc..5542885 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -215,14 +215,14 @@
}
static std::unique_ptr<GrDrawOp> Make(GrContext* context,
const GrRenderTargetContext::TextureSetEntry set[],
- int cnt, GrSamplerState::Filter filter, float alpha,
- GrAAType aaType, const SkMatrix& viewMatrix,
+ int cnt, GrSamplerState::Filter filter, GrAAType aaType,
+ const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureColorSpaceXform) {
size_t size = sizeof(TextureOp) + sizeof(Proxy) * (cnt - 1);
GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
void* mem = pool->allocate(size);
- return std::unique_ptr<GrDrawOp>(new (mem) TextureOp(
- set, cnt, filter, alpha, aaType, viewMatrix, std::move(textureColorSpaceXform)));
+ return std::unique_ptr<GrDrawOp>(new (mem) TextureOp(set, cnt, filter, aaType, viewMatrix,
+ std::move(textureColorSpaceXform)));
}
~TextureOp() override {
@@ -338,13 +338,12 @@
static_cast<unsigned>(fProxies[0].fProxy->canSkipResourceAllocator());
}
TextureOp(const GrRenderTargetContext::TextureSetEntry set[], int cnt,
- GrSamplerState::Filter filter, float alpha, GrAAType aaType,
- const SkMatrix& viewMatrix, sk_sp<GrColorSpaceXform> textureColorSpaceXform)
+ GrSamplerState::Filter filter, GrAAType aaType, const SkMatrix& viewMatrix,
+ sk_sp<GrColorSpaceXform> textureColorSpaceXform)
: INHERITED(ClassID())
, fTextureColorSpaceXform(std::move(textureColorSpaceXform))
, fFilter(static_cast<unsigned>(filter))
, fFinalized(0) {
- alpha = SkTPin(alpha, 0.f, 1.f);
fQuads.reserve(cnt);
fProxyCnt = SkToUInt(cnt);
SkRect bounds = SkRectPriv::MakeLargestInverted();
@@ -376,8 +375,8 @@
mustFilter = quadType != GrQuadType::kRect ||
filter_has_effect_for_rect_stays_rect(quad, set[p].fSrcRect);
}
- float quadAlpha = SkTPin(set[p].fAlpha, 0.f, 1.f) * alpha;
- SkPMColor4f color{quadAlpha, quadAlpha, quadAlpha, quadAlpha};
+ float alpha = SkTPin(set[p].fAlpha, 0.f, 1.f);
+ SkPMColor4f color{alpha, alpha, alpha, alpha};
fQuads.emplace_back(set[p].fSrcRect, quad, aaFlags, SkCanvas::kFast_SrcRectConstraint,
color);
}
@@ -644,11 +643,10 @@
const GrRenderTargetContext::TextureSetEntry set[],
int cnt,
GrSamplerState::Filter filter,
- float alpha,
GrAAType aaType,
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureColorSpaceXform) {
- return TextureOp::Make(context, set, cnt, filter, alpha, aaType, viewMatrix,
+ return TextureOp::Make(context, set, cnt, filter, aaType, viewMatrix,
std::move(textureColorSpaceXform));
}
diff --git a/src/gpu/ops/GrTextureOp.h b/src/gpu/ops/GrTextureOp.h
index 50192c1..44d34ab 100644
--- a/src/gpu/ops/GrTextureOp.h
+++ b/src/gpu/ops/GrTextureOp.h
@@ -43,7 +43,6 @@
const GrRenderTargetContext::TextureSetEntry[],
int cnt,
GrSamplerState::Filter,
- float alpha,
GrAAType,
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureXform);