Update tests for a V1-only skgpu::v1::SurfaceDrawContext
Bug: skia:11837
Change-Id: If8dd864d6cd8bc5ab9569fbab40866e1810dbc27
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/434162
Reviewed-by: Michael Ludwig <[email protected]>
Commit-Queue: Robert Phillips <[email protected]>
diff --git a/tests/WrappedSurfaceCopyOnWriteTest.cpp b/tests/WrappedSurfaceCopyOnWriteTest.cpp
index 215b9f3..2725cf4 100644
--- a/tests/WrappedSurfaceCopyOnWriteTest.cpp
+++ b/tests/WrappedSurfaceCopyOnWriteTest.cpp
@@ -13,8 +13,8 @@
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/GrDirectContextPriv.h"
#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrSurfaceFillContext.h"
#include "src/gpu/GrSurfaceProxy.h"
-#include "src/gpu/v1/SurfaceDrawContext_v1.h"
#include "tests/Test.h"
#include "tests/TestUtils.h"
#include "tools/gpu/BackendSurfaceFactory.h"
@@ -82,26 +82,27 @@
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkipCopyTaskTest, reporter, ctxInfo) {
GrDirectContext* dContext = ctxInfo.directContext();
- auto dst = skgpu::v1::SurfaceDrawContext::Make(dContext,
- GrColorType::kRGBA_8888,
- /*color space*/ nullptr,
- SkBackingFit::kExact,
- {10, 10},
- SkSurfaceProps());
- dst->clear(SkPMColor4f{1, 0, 0, 1});
+ GrImageInfo info(GrColorType::kRGBA_8888,
+ kPremul_SkAlphaType,
+ /*color space*/ nullptr,
+ 10, 10);
- auto src = skgpu::v1::SurfaceDrawContext::Make(dContext,
- GrColorType::kRGBA_8888,
- /*color space*/ nullptr,
- SkBackingFit::kExact,
- {10, 10},
- SkSurfaceProps());
- src->clear(SkPMColor4f{0, 0, 1, 1});
+ auto dstSC = GrSurfaceContext::Make(dContext, info,
+ SkBackingFit::kExact,
+ kBottomLeft_GrSurfaceOrigin,
+ GrRenderable::kYes);
+ dstSC->asFillContext()->clear(SkPMColor4f{1, 0, 0, 1});
+
+ auto srcSC = GrSurfaceContext::Make(dContext, info,
+ SkBackingFit::kExact,
+ kBottomLeft_GrSurfaceOrigin,
+ GrRenderable::kYes);
+ srcSC->asFillContext()->clear(SkPMColor4f{0, 0, 1, 1});
sk_sp<GrRenderTask> task =
- dContext->priv().drawingManager()->newCopyRenderTask(src->asSurfaceProxyRef(),
+ dContext->priv().drawingManager()->newCopyRenderTask(srcSC->asSurfaceProxyRef(),
SkIRect::MakeWH(10, 10),
- dst->asSurfaceProxyRef(),
+ dstSC->asSurfaceProxyRef(),
{0, 0},
kTopLeft_GrSurfaceOrigin);
@@ -114,7 +115,7 @@
SkAutoPixmapStorage pixels;
pixels.alloc(SkImageInfo::Make({10, 10}, kRGBA_8888_SkColorType, kPremul_SkAlphaType));
- dst->readPixels(dContext, pixels, {0, 0});
+ dstSC->readPixels(dContext, pixels, {0, 0});
float kTol[4] = {};
std::function<ComparePixmapsErrorReporter> errorReporter(
[&](int x, int y, const float diffs[4]) {
@@ -124,6 +125,9 @@
CheckSolidPixels(SkColor4f{1, 0, 0, 1}, pixels, kTol, errorReporter);
}
+#if SK_GPU_V1
+#include "src/gpu/v1/SurfaceDrawContext_v1.h"
+
// Make sure GrOpsTask are skippable
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkipOpsTaskTest, reporter, ctxInfo) {
GrDirectContext* dContext = ctxInfo.directContext();
@@ -164,3 +168,4 @@
});
CheckSolidPixels(SkColor4f{1, 0, 0, 1}, pixels, kTol, errorReporter);
}
+#endif // SK_GPU_V1
