GPU clear values: just 4 floats
We previously represented these as SkPMColor4f. However, upcoming
changes will add limited support for clearing/drawing to unpremul
dst. Just store the clear values as four floats without assigned
interpretation.
Also, noticed a bug by code inspection: we weren't accounting for
write view swizzle in GrRTC. Fixed and added gm to test.
Bug: skia:11019
Change-Id: I1bce1f6c97a156c0377ebad1b166eb641362b67a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340098
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index ba5c161..0d5c7a6 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -284,10 +284,20 @@
}
}
if (src->asTextureProxy()) {
- auto dstContext = GrRenderTargetContext::Make(
- context, GrColorType::kUnknown, nullptr, fit, {width, height}, format, 1, mipMapped,
- src->isProtected(), origin, budgeted, nullptr);
- GrSurfaceProxyView view(sk_ref_sp(src), origin, GrSwizzle("rgba"));
+ auto dstContext = GrRenderTargetContext::Make(context,
+ nullptr,
+ fit,
+ {width, height},
+ format,
+ /* sample count*/ 1,
+ mipMapped,
+ src->isProtected(),
+ GrSwizzle::RGBA(),
+ GrSwizzle::RGBA(),
+ origin,
+ budgeted,
+ /*surface props*/ nullptr);
+ GrSurfaceProxyView view(sk_ref_sp(src), origin, GrSwizzle::RGBA());
if (dstContext && dstContext->blitTexture(std::move(view), srcRect, dstPoint)) {
return dstContext->asSurfaceProxyRef();
}