Add support for plumbing GrDstSampleType through Ops and Pipeline creation.
This CL adds a new type GrDstSampleType to say how we will sample the dst.
We add tracking of the GrDstSampleType in the recording of GrOps and
then during execution passing the information along to the GrPipeline.
In general the tracking of GrDstSampleType is a global state of a GrOpsTask
so it is kept separate fro the DstProxyView which is more specific to a
single Op on the GrOpsTask.
Bug: skia:10409
Change-Id: Ie843c31f2e48a887daf96cee99ed159b196cb545
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315645
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 4f1baa0..55d5ca0 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -93,7 +93,8 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView) override {
+ const GrXferProcessor::DstProxyView& dstProxyView,
+ GrXferBarrierFlags renderPassXferBarriers) override {
auto gp = this->makeGP(*caps, arena);
if (!gp) {
return;
@@ -106,6 +107,7 @@
dstProxyView, gp,
std::move(fProcessorSet),
GrPrimitiveType::kTriangles,
+ renderPassXferBarriers,
flags);
}
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index 0b1892d..e7a3629 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -162,13 +162,15 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView) const {
+ const GrXferProcessor::DstProxyView& dstProxyView,
+ GrXferBarrierFlags renderPassXferBarriers) const {
GrGeometryProcessor* geomProc = ClockwiseTestProcessor::Make(arena, fReadSkFragCoord);
return sk_gpu_test::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
geomProc, SkBlendMode::kPlus,
- GrPrimitiveType::kTriangleStrip);
+ GrPrimitiveType::kTriangleStrip,
+ renderPassXferBarriers);
}
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
@@ -176,20 +178,23 @@
flushState->allocator(),
flushState->writeView(),
flushState->detachAppliedClip(),
- flushState->dstProxyView());
+ flushState->dstProxyView(),
+ flushState->renderPassBarriers());
}
void onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView) final {
+ const GrXferProcessor::DstProxyView& dstProxyView,
+ GrXferBarrierFlags renderPassXferBarriers) final {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
// This is equivalent to a GrOpFlushState::detachAppliedClip
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip::Disabled();
fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, writeView,
- std::move(appliedClip), dstProxyView);
+ std::move(appliedClip), dstProxyView,
+ renderPassXferBarriers);
context->priv().recordProgramInfo(fProgramInfo);
}
diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp
index 32b699e..bd2be0f 100644
--- a/gm/fwidth_squircle.cpp
+++ b/gm/fwidth_squircle.cpp
@@ -172,13 +172,15 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView) const {
+ const GrXferProcessor::DstProxyView& dstProxyView,
+ GrXferBarrierFlags renderPassXferBarriers) const {
GrGeometryProcessor* geomProc = FwidthSquircleTestProcessor::Make(arena, fViewMatrix);
return sk_gpu_test::CreateProgramInfo(caps, arena, writeView,
std::move(appliedClip), dstProxyView,
geomProc, SkBlendMode::kSrcOver,
- GrPrimitiveType::kTriangleStrip);
+ GrPrimitiveType::kTriangleStrip,
+ renderPassXferBarriers);
}
GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
@@ -186,20 +188,23 @@
flushState->allocator(),
flushState->writeView(),
flushState->detachAppliedClip(),
- flushState->dstProxyView());
+ flushState->dstProxyView(),
+ flushState->renderPassBarriers());
}
void onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView) final {
+ const GrXferProcessor::DstProxyView& dstProxyView,
+ GrXferBarrierFlags renderPassXferBarriers) final {
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
// This is equivalent to a GrOpFlushState::detachAppliedClip
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip::Disabled();
fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, writeView,
- std::move(appliedClip), dstProxyView);
+ std::move(appliedClip), dstProxyView,
+ renderPassXferBarriers);
context->priv().recordProgramInfo(fProgramInfo);
}
diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
index 0ceda73..5c81980 100644
--- a/gm/samplelocations.cpp
+++ b/gm/samplelocations.cpp
@@ -244,7 +244,8 @@
SkArenaAlloc* arena,
const GrSurfaceProxyView* writeView,
GrAppliedClip&& appliedClip,
- const GrXferProcessor::DstProxyView& dstProxyView) const {
+ const GrXferProcessor::DstProxyView& dstProxyView,
+ GrXferBarrierFlags renderPassXferBarriers) const {
GrGeometryProcessor* geomProc = SampleLocationsTestProcessor::Make(arena, fGradType);
GrPipeline::InputFlags flags = GrPipeline::InputFlags::kHWAntialias;
@@ -253,6 +254,7 @@
std::move(appliedClip), dstProxyView,
geomProc, SkBlendMode::kSrcOver,
GrPrimitiveType::kTriangleStrip,
+ renderPassXferBarriers,
flags, &gStencilWrite);
}
@@ -261,13 +263,15 @@
flushState->allocator(),
flushState->writeView(),
flushState->detachAppliedClip(),
- flushState->dstProxyView());
+ flushState->dstProxyView(),
+ flushState->renderPassBarriers());
}
void onPrePrepare(GrRecordingContext* context,
const GrSurfaceProxyView* writeView,
GrAppliedClip* clip,
- const GrXferProcessor::DstProxyView& dstProxyView) final {
+ const GrXferProcessor::DstProxyView& dstProxyView,
+ GrXferBarrierFlags renderPassXferBarriers) final {
// We're going to create the GrProgramInfo (and the GrPipeline and geometry processor
// it relies on) in the DDL-record-time arena.
SkArenaAlloc* arena = context->priv().recordTimeAllocator();
@@ -276,7 +280,8 @@
GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip::Disabled();
fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, writeView,
- std::move(appliedClip), dstProxyView);
+ std::move(appliedClip), dstProxyView,
+ renderPassXferBarriers);
context->priv().recordProgramInfo(fProgramInfo);
}
diff --git a/gm/tessellation.cpp b/gm/tessellation.cpp
index 40709ec..34c58cc 100644
--- a/gm/tessellation.cpp
+++ b/gm/tessellation.cpp
@@ -313,7 +313,8 @@
void onPrePrepare(GrRecordingContext*,
const GrSurfaceProxyView* writeView,
GrAppliedClip*,
- const GrXferProcessor::DstProxyView&) override {}
+ const GrXferProcessor::DstProxyView&,
+ GrXferBarrierFlags renderPassXferBarriers) override {}
void onPrepare(GrOpFlushState* flushState) override {
if (fTriPositions) {
@@ -345,7 +346,7 @@
GrProgramInfo programInfo(state->proxy()->numSamples(), state->proxy()->numStencilSamples(),
state->proxy()->backendFormat(), state->writeView()->origin(),
&pipeline, shader.get(), GrPrimitiveType::kPatches,
- tessellationPatchVertexCount);
+ tessellationPatchVertexCount, state->renderPassBarriers());
state->bindPipeline(programInfo, SkRect::MakeIWH(kWidth, kHeight));
state->bindBuffers(nullptr, nullptr, std::move(fVertexBuffer));