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

add support to run dl_canvas_unittests on GPU surfaces (off by default) #38993

Merged
auto-submit merged 11 commits into from
Feb 10, 2023
Merged

add support to run dl_canvas_unittests on GPU surfaces (off by default) #38993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
69301f1
add support to run dl_canvas_unittests on GPU surfaces (off by default)
flar Jan 19, 2023
fb4074c
empty commit to trigger build
flar Jan 19, 2023
0ed3cf8
conditionally include platform-specific surface provider headers
flar Jan 19, 2023
8f69582
ignore DL test files during license checks
flar Jan 19, 2023
3fbd906
typo
flar Jan 19, 2023
fc540cc
add dependencies to rendertests to hopefully build on Windows
flar Jan 20, 2023
fbc7d1a
remove benchmarking deps from dl_rendertests
flar Jan 21, 2023
645df47
more changes to get Windows rendertests to link
flar Jan 24, 2023
1adf0ab
add --enable-gl synonym and prevent non-SW surface provider dest on W…
flar Jan 26, 2023
3e08124
fix gn formatting
flar Jan 26, 2023
f342e3d
review feedback
flar Feb 10, 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 ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
../../../flutter/display_list/display_list_unittests.cc
../../../flutter/display_list/display_list_utils_unittests.cc
../../../flutter/display_list/display_list_vertices_unittests.cc
../../../flutter/display_list/testing
../../../flutter/docs
../../../flutter/examples
../../../flutter/flow/README.md
Expand Down
20 changes: 0 additions & 20 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,16 +822,8 @@ ORIGIN: ../../../flutter/common/task_runners.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_attributes.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_attributes_testing.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks_canvas_provider.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks_gl.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks_gl.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks_metal.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks_metal.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks_software.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_benchmarks_software.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_blend_mode.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_blend_mode.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_builder.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -881,8 +873,6 @@ ORIGIN: ../../../flutter/display_list/display_list_rtree.h + ../../../flutter/LI
ORIGIN: ../../../flutter/display_list/display_list_runtime_effect.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_runtime_effect.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_sampling_options.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_test_utils.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_test_utils.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_tile_mode.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_utils.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/display_list/display_list_utils.h + ../../../flutter/LICENSE
Expand Down Expand Up @@ -3309,16 +3299,8 @@ FILE: ../../../flutter/common/task_runners.h
FILE: ../../../flutter/display_list/display_list.cc
FILE: ../../../flutter/display_list/display_list.h
FILE: ../../../flutter/display_list/display_list_attributes.h
FILE: ../../../flutter/display_list/display_list_attributes_testing.h
FILE: ../../../flutter/display_list/display_list_benchmarks.cc
FILE: ../../../flutter/display_list/display_list_benchmarks.h
FILE: ../../../flutter/display_list/display_list_benchmarks_canvas_provider.h
FILE: ../../../flutter/display_list/display_list_benchmarks_gl.cc
FILE: ../../../flutter/display_list/display_list_benchmarks_gl.h
FILE: ../../../flutter/display_list/display_list_benchmarks_metal.cc
FILE: ../../../flutter/display_list/display_list_benchmarks_metal.h
FILE: ../../../flutter/display_list/display_list_benchmarks_software.cc
FILE: ../../../flutter/display_list/display_list_benchmarks_software.h
FILE: ../../../flutter/display_list/display_list_blend_mode.cc
FILE: ../../../flutter/display_list/display_list_blend_mode.h
FILE: ../../../flutter/display_list/display_list_builder.cc
Expand Down Expand Up @@ -3368,8 +3350,6 @@ FILE: ../../../flutter/display_list/display_list_rtree.h
FILE: ../../../flutter/display_list/display_list_runtime_effect.cc
FILE: ../../../flutter/display_list/display_list_runtime_effect.h
FILE: ../../../flutter/display_list/display_list_sampling_options.h
FILE: ../../../flutter/display_list/display_list_test_utils.cc
FILE: ../../../flutter/display_list/display_list_test_utils.h
FILE: ../../../flutter/display_list/display_list_tile_mode.h
FILE: ../../../flutter/display_list/display_list_utils.cc
FILE: ../../../flutter/display_list/display_list_utils.h
Expand Down
77 changes: 5 additions & 72 deletions display_list/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,6 @@ if (enable_unittests) {
fixtures = []
}

source_set("display_list_testing") {
testonly = true

sources = [
"display_list_attributes_testing.h",
"display_list_test_utils.cc",
"display_list_test_utils.h",
]

deps = [
"//flutter/testing:testing_lib",
"//third_party/skia",
]

public_deps = [ ":display_list" ]
}

executable("display_list_unittests") {
testonly = true

Expand All @@ -126,7 +109,7 @@ if (enable_unittests) {
deps = [
":display_list",
":display_list_fixtures",
":display_list_testing",
"//flutter/display_list/testing:display_list_testing",
"//flutter/testing",
]

Expand All @@ -153,7 +136,8 @@ if (enable_unittests) {
deps = [
":display_list",
":display_list_fixtures",
":display_list_testing",
"//flutter/display_list/testing:display_list_surface_provider",
"//flutter/display_list/testing:display_list_testing",
"//flutter/testing",
]

Expand All @@ -180,8 +164,8 @@ if (enable_unittests) {
deps = [
":display_list",
":display_list_fixtures",
":display_list_testing",
"//flutter/benchmarking",
"//flutter/display_list/testing:display_list_testing",
"//flutter/testing:testing_lib",
]
}
Expand All @@ -204,64 +188,13 @@ source_set("display_list_benchmarks_source") {
":display_list_benchmarks_fixtures",
"//flutter/benchmarking",
"//flutter/common/graphics",
"//flutter/display_list/testing:display_list_surface_provider",
"//flutter/fml",
"//flutter/testing:skia",
"//flutter/testing:testing_lib",
"//third_party/dart/runtime:libdart_jit", # for tracing
"//third_party/skia",
]

defines = []

if (is_android) {
libs = [
"android",
"EGL",
"GLESv2",
]
}

# We only do software benchmarks on non-mobile platforms
if (!is_android && !is_ios) {
sources += [
"display_list_benchmarks_software.cc",
"display_list_benchmarks_software.h",
]
defines += [ "ENABLE_SOFTWARE_BENCHMARKS" ]
}

# iOS and Fuchsia don't support OpenGL
_enable_gl_benchmarks = !is_fuchsia && !is_ios

# TODO (https://github.com/flutter/flutter/issues/107357):
# impeller_enable_vulkan currently requires skia to not use VMA, which inturn
# causes linkage problems with swiftshader.
if (impeller_enable_vulkan) {
_enable_gl_benchmarks = false
}

if (_enable_gl_benchmarks) {
defines += [ "ENABLE_OPENGL_BENCHMARKS" ]
sources += [
"display_list_benchmarks_gl.cc",
"display_list_benchmarks_gl.h",
]
deps += [ "//flutter/testing:opengl" ]
}

if (is_mac || is_ios) {
defines += [ "ENABLE_METAL_BENCHMARKS" ]
sources += [
"display_list_benchmarks_metal.cc",
"display_list_benchmarks_metal.h",
]
deps += [ "//flutter/testing:metal" ]
}

# Don't snapshot test results on mobile platforms
if (is_android || is_ios) {
defines += [ "BENCHMARKS_NO_SNAPSHOT" ]
}
}

executable("display_list_benchmarks") {
Expand Down
Loading