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

Purge resources on rasterizer teardown #33890

Merged
fluttergithubbot merged 10 commits into from
Jun 8, 2022
Merged

Purge resources on rasterizer teardown #33890

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cdacfae
Purge resources on rasterizer teardown
dnfield Jun 7, 2022
fdaccd9
Fix vulkan tests
dnfield Jun 8, 2022
4606bb7
Merge remote-tracking branch 'upstream/main' into rasterizer_cache
dnfield Jun 8, 2022
3a06ddd
avoid nullptr deref
dnfield Jun 8, 2022
9a69f64
another test
dnfield Jun 8, 2022
9f01892
merge
dnfield Jun 8, 2022
ae5131d
Skip for now
dnfield Jun 8, 2022
8e77b8d
jason review
dnfield Jun 8, 2022
d0ef180
another skip
dnfield Jun 8, 2022
2470dbe
unskip, try using sys libvulkan on fuchsia
dnfield Jun 8, 2022
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
Prev Previous commit
unskip, try using sys libvulkan on fuchsia
  • Loading branch information
@dnfield
dnfield committed Jun 8, 2022
commit 2470dbe4eb8940e74635813288cc8813e9aaf55c
10 changes: 5 additions & 5 deletions shell/common/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,6 @@ if (enable_unittests) {
"//third_party/googletest:gmock",
]

# Swiftshader only supports x86/64.
if (shell_enable_vulkan && (target_cpu == "x86" || target_cpu == "x64")) {
deps += [ "//third_party/swiftshader_flutter:swiftshader_vulkan" ]
}

if (is_fuchsia) {
sources += [ "shell_fuchsia_unittests.cc" ]

Expand All @@ -307,6 +302,11 @@ if (enable_unittests) {
} else {
# TODO(63837): This test is hard-coded to use a TestGLSurface so it cannot run on fuchsia.
sources += [ "shell_io_manager_unittests.cc" ]

# Swiftshader only supports x86/64. Only needed on non-Fuchsia platforms.
if (shell_enable_vulkan && (target_cpu == "x86" || target_cpu == "x64")) {
deps += [ "//third_party/swiftshader_flutter:swiftshader_vulkan" ]
}
}
}
}
4 changes: 3 additions & 1 deletion shell/common/shell_test_platform_view_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#include "flutter/shell/common/context_options.h"
#include "flutter/vulkan/vulkan_utilities.h"

#ifdef FML_OS_MACOSX
#if OS_FUCHSIA
#define VULKAN_SO_PATH "libvulkan.so"
Copy link
Contributor Author

@dnfield dnfield Jun 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akbiggs FYI

#elif FML_OS_MACOSX
#define VULKAN_SO_PATH "libvk_swiftshader.dylib"
#elif FML_OS_WIN
#define VULKAN_SO_PATH "vk_swiftshader.dll"
Expand Down
11 changes: 0 additions & 11 deletions shell/common/shell_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,12 +615,6 @@ static void CheckFrameTimings(const std::vector<FrameTiming>& timings,
}

TEST_F(ShellTest, ReportTimingsIsCalled) {
// This test times out on FEMU.
// https://github.com/flutter/flutter/issues/105642
#if OS_FUCHSIA
GTEST_SKIP();
#endif

fml::TimePoint start = fml::TimePoint::Now();
auto settings = CreateSettingsForFixture();
std::unique_ptr<Shell> shell = CreateShell(settings);
Expand Down Expand Up @@ -671,11 +665,6 @@ TEST_F(ShellTest, ReportTimingsIsCalled) {
}

TEST_F(ShellTest, FrameRasterizedCallbackIsCalled) {
// This test times out on FEMU.
// https://github.com/flutter/flutter/issues/105642
#if OS_FUCHSIA
GTEST_SKIP();
#endif
fml::TimePoint start = fml::TimePoint::Now();

auto settings = CreateSettingsForFixture();
Expand Down