Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Replace SkSurface::flush methods with GrDirectContext methods #42425

Merged
merged 4 commits into from
May 31, 2023
Merged

Replace SkSurface::flush methods with GrDirectContext methods #42425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1e4f8d
Replace SkSurface::flush methods
kjlubick May 30, 2023
0329ad8
Merge branch 'main' into flushing
kjlubick May 31, 2023
b02339e
fix lint
kjlubick May 31, 2023
66658cd
Merge branch 'flushing' of github.com:kjlubick/engine into flushing
kjlubick May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions display_list/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ if (enable_unittests) {
deps = [
":display_list",
":display_list_fixtures",
"//flutter/common/graphics",
"//flutter/display_list/testing:display_list_surface_provider",
"//flutter/display_list/testing:display_list_testing",
"//flutter/testing",
Expand Down
44 changes: 28 additions & 16 deletions display_list/benchmarking/dl_benchmarks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "third_party/skia/include/core/SkPoint.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/core/SkTextBlob.h"
#include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/include/gpu/GrRecordingContext.h"

namespace flutter {
namespace testing {
Expand Down Expand Up @@ -39,6 +41,16 @@ DlPaint GetPaintForRun(unsigned attributes) {
return paint;
}

static void FlushSubmitCpuSync(const sk_sp<SkSurface>& surface) {
if (!surface) {
return;
}
if (GrDirectContext* dContext =
GrAsDirectContext(surface->recordingContext())) {
dContext->flushAndSubmit(surface, /*syncCpu=*/true);
}
}

void AnnotateAttributes(unsigned attributes,
benchmark::State& state,
const DisplayListAttributeFlags flags) {
Expand Down Expand Up @@ -100,7 +112,7 @@ void BM_DrawLine(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawLine-" +
Expand Down Expand Up @@ -149,7 +161,7 @@ void BM_DrawRect(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawRect-" +
Expand Down Expand Up @@ -195,7 +207,7 @@ void BM_DrawOval(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawOval-" +
Expand Down Expand Up @@ -243,7 +255,7 @@ void BM_DrawCircle(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawCircle-" +
Expand Down Expand Up @@ -321,7 +333,7 @@ void BM_DrawRRect(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawRRect-" +
Expand Down Expand Up @@ -403,7 +415,7 @@ void BM_DrawDRRect(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawDRRect-" +
Expand Down Expand Up @@ -456,7 +468,7 @@ void BM_DrawArc(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawArc-" +
Expand Down Expand Up @@ -659,7 +671,7 @@ void BM_DrawPath(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawPath-" + label +
Expand Down Expand Up @@ -805,7 +817,7 @@ void BM_DrawVertices(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawVertices-" +
Expand Down Expand Up @@ -901,7 +913,7 @@ void BM_DrawPoints(benchmark::State& state,

for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawPoints-" +
Expand Down Expand Up @@ -979,7 +991,7 @@ void BM_DrawImage(benchmark::State& state,

for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawImage-" +
Expand Down Expand Up @@ -1065,7 +1077,7 @@ void BM_DrawImageRect(benchmark::State& state,

for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawImageRect-" +
Expand Down Expand Up @@ -1152,7 +1164,7 @@ void BM_DrawImageNine(benchmark::State& state,

for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawImageNine-" +
Expand Down Expand Up @@ -1198,7 +1210,7 @@ void BM_DrawTextBlob(benchmark::State& state,

for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawTextBlob-" +
Expand Down Expand Up @@ -1263,7 +1275,7 @@ void BM_DrawShadow(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-DrawShadow-" +
Expand Down Expand Up @@ -1317,7 +1329,7 @@ void BM_SaveLayer(benchmark::State& state,
// We only want to time the actual rasterization.
for ([[maybe_unused]] auto _ : state) {
canvas.DrawDisplayList(display_list);
surface->flushAndSubmit(true);
FlushSubmitCpuSync(surface);
}

auto filename = surface_provider->backend_name() + "-SaveLayer-" +
Expand Down
7 changes: 6 additions & 1 deletion display_list/testing/dl_rendering_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
#include "third_party/skia/include/effects/SkImageFilters.h"
#include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/include/gpu/GrRecordingContext.h"

namespace flutter {
namespace testing {
Expand Down Expand Up @@ -490,7 +492,10 @@ class RenderEnvironment {
canvas->restoreToCount(restore_count);

canvas->flush();
surface->flushAndSubmit(true);
if (GrDirectContext* dContext =
GrAsDirectContext(surface->recordingContext())) {
dContext->flushAndSubmit(surface, /*syncCpu=*/true);
}
return std::make_unique<RenderResult>(surface);
}

Expand Down
2 changes: 1 addition & 1 deletion vulkan/vulkan_swapchain.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ bool VulkanSwapchain::Submit() {
// Step 0:
// Make sure Skia has flushed all work for the surface to the gpu.
// ---------------------------------------------------------------------------
surface->flushAndSubmit();
skgpu::ganesh::FlushAndSubmit(surface);

// ---------------------------------------------------------------------------
// Step 1:
Expand Down