DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Delete Settings::msaa_samples. (flutter/engine#52780)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/148257
This commit is contained in:
Chinmay Garde 2024-05-13 16:51:11 -07:00 committed by GitHub
parent e4e7a45b0f
commit f3934883b0
29 changed files with 41 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/ci/licenses_golden/licenses_flutter
View File

@ -39872,7 +39872,6 @@ ORIGIN: ../../../flutter/benchmarking/library.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/common/constants.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/common/graphics/gl_context_switch.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/common/graphics/gl_context_switch.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/common/graphics/msaa_sample_count.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/common/graphics/persistent_cache.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/common/graphics/persistent_cache.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/common/graphics/texture.cc + ../../../flutter/LICENSE
@ -42748,7 +42747,6 @@ FILE: ../../../flutter/common/exported_test_symbols.sym
FILE: ../../../flutter/common/exported_test_symbols_mac.sym
FILE: ../../../flutter/common/graphics/gl_context_switch.cc
FILE: ../../../flutter/common/graphics/gl_context_switch.h
FILE: ../../../flutter/common/graphics/msaa_sample_count.h
FILE: ../../../flutter/common/graphics/persistent_cache.cc
FILE: ../../../flutter/common/graphics/persistent_cache.h
FILE: ../../../flutter/common/graphics/texture.cc

1
engine/src/flutter/common/graphics/BUILD.gn
View File

@ -10,7 +10,6 @@ source_set("graphics") {
sources = [
"gl_context_switch.cc",
"gl_context_switch.h",
"msaa_sample_count.h",
"persistent_cache.cc",
"persistent_cache.h",
"texture.cc",

17
engine/src/flutter/common/graphics/msaa_sample_count.h
View File

@ -1,17 +0,0 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef FLUTTER_COMMON_GRAPHICS_MSAA_SAMPLE_COUNT_H_
#define FLUTTER_COMMON_GRAPHICS_MSAA_SAMPLE_COUNT_H_
// Supported MSAA sample count values.
enum class MsaaSampleCount {
kNone = 1,
kTwo = 2,
kFour = 4,
kEight = 8,
kSixteen = 16,
};
#endif // FLUTTER_COMMON_GRAPHICS_MSAA_SAMPLE_COUNT_H_

7
engine/src/flutter/common/settings.h
View File

@ -346,13 +346,6 @@ struct Settings {
// Max bytes threshold of resource cache, or 0 for unlimited.
size_t resource_cache_max_bytes_threshold = 0;
/// The minimum number of samples to require in multipsampled anti-aliasing.
///
/// Setting this value to 0 or 1 disables MSAA.
/// If it is not 0 or 1, it must be one of 2, 4, 8, or 16. However, if the
/// GPU does not support the requested sampling value, MSAA will be disabled.
uint8_t msaa_samples = 0;
/// Enable embedder api on the embedder.
///
/// This is currently only used by iOS.

3
engine/src/flutter/shell/common/shell_test_platform_view_metal.mm
View File

@ -116,8 +116,7 @@ std::unique_ptr<Surface> ShellTestPlatformViewMetal::CreateRenderingSurface() {
return std::make_unique<GPUSurfaceMetalImpeller>(this,
[metal_context_->impeller_context() context]);
}
return std::make_unique<GPUSurfaceMetalSkia>(this, [metal_context_->context() mainContext],
MsaaSampleCount::kNone);
return std::make_unique<GPUSurfaceMetalSkia>(this, [metal_context_->context() mainContext]);
}
// |PlatformView|

22
engine/src/flutter/shell/common/switches.cc
View File

@ -519,28 +519,6 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) {
std::stoi(resource_cache_max_bytes_threshold);
}
if (command_line.HasOption(FlagForSwitch(Switch::MsaaSamples))) {
std::string msaa_samples;
command_line.GetOptionValue(FlagForSwitch(Switch::MsaaSamples),
&msaa_samples);
if (msaa_samples == "0") {
settings.msaa_samples = 0;
} else if (msaa_samples == "1") {
settings.msaa_samples = 1;
} else if (msaa_samples == "2") {
settings.msaa_samples = 2;
} else if (msaa_samples == "4") {
settings.msaa_samples = 4;
} else if (msaa_samples == "8") {
settings.msaa_samples = 8;
} else if (msaa_samples == "16") {
settings.msaa_samples = 16;
} else {
FML_DLOG(ERROR) << "Invalid value for --msaa-samples: '" << msaa_samples
<< "' (expected 0, 1, 2, 4, 8, or 16).";
}
}
settings.enable_platform_isolates =
command_line.HasOption(FlagForSwitch(Switch::EnablePlatformIsolates));

7
engine/src/flutter/shell/common/switches.h
View File

@ -288,13 +288,6 @@ DEF_SWITCH(LeakVM,
"When the last shell shuts down, the shared VM is leaked by default "
"(the leak_vm in VM settings is true). To clean up the leak VM, set "
"this value to false.")
DEF_SWITCH(
MsaaSamples,
"msaa-samples",
"The minimum number of samples to require for multisampled anti-aliasing. "
"Setting this value to 0 or 1 disables MSAA. If it is not 0 or 1, it must "
"be one of 2, 4, 8, or 16. However, if the GPU does not support the "
"requested sampling value, MSAA will be disabled.")
DEF_SWITCH(EnableEmbedderAPI,
"enable-embedder-api",
"Enable the embedder api. Defaults to false. iOS only.")

18
engine/src/flutter/shell/common/switches_unittests.cc
View File

@ -69,24 +69,6 @@ TEST(SwitchesTest, RouteParsedFlag) {
EXPECT_TRUE(settings.route.empty());
}
TEST(SwitchesTest, MsaaSamples) {
for (int samples : {0, 1, 2, 4, 8, 16}) {
fml::CommandLine command_line = fml::CommandLineFromInitializerList(
{"command", ("--msaa-samples=" + std::to_string(samples)).c_str()});
Settings settings = SettingsFromCommandLine(command_line);
EXPECT_EQ(settings.msaa_samples, samples);
}
fml::CommandLine command_line =
fml::CommandLineFromInitializerList({"command", "--msaa-samples=3"});
Settings settings = SettingsFromCommandLine(command_line);
EXPECT_EQ(settings.msaa_samples, 0);
command_line =
fml::CommandLineFromInitializerList({"command", "--msaa-samples=foobar"});
settings = SettingsFromCommandLine(command_line);
EXPECT_EQ(settings.msaa_samples, 0);
}
TEST(SwitchesTest, EnableEmbedderAPI) {
{
// enable

3
engine/src/flutter/shell/gpu/gpu_surface_metal_skia.h
View File

@ -7,7 +7,6 @@
#if !SLIMPELLER
#include "flutter/common/graphics/msaa_sample_count.h"
#include "flutter/flow/surface.h"
#include "flutter/fml/macros.h"
#include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
@ -19,7 +18,6 @@ class SK_API_AVAILABLE_CA_METAL_LAYER GPUSurfaceMetalSkia : public Surface {
public:
GPUSurfaceMetalSkia(GPUSurfaceMetalDelegate* delegate,
sk_sp<GrDirectContext> context,
MsaaSampleCount msaa_samples,
bool render_to_surface = true);
// |Surface|
@ -33,7 +31,6 @@ class SK_API_AVAILABLE_CA_METAL_LAYER GPUSurfaceMetalSkia : public Surface {
const MTLRenderTargetType render_target_type_;
sk_sp<GrDirectContext> context_;
GrDirectContext* precompiled_sksl_context_ = nullptr;
MsaaSampleCount msaa_samples_ = MsaaSampleCount::kNone;
// TODO(38466): Refactor GPU surface APIs take into account the fact that an
// external view embedder may want to render to the root surface. This is a
// hack to make avoid allocating resources for the root surface when an

14
engine/src/flutter/shell/gpu/gpu_surface_metal_skia.mm
View File

@ -41,7 +41,6 @@ namespace {
sk_sp<SkSurface> CreateSurfaceFromMetalTexture(GrDirectContext* context,
id<MTLTexture> texture,
GrSurfaceOrigin origin,
MsaaSampleCount sample_cnt,
SkColorType color_type,
sk_sp<SkColorSpace> color_space,
const SkSurfaceProps* props,
@ -51,20 +50,18 @@ sk_sp<SkSurface> CreateSurfaceFromMetalTexture(GrDirectContext* context,
info.fTexture.reset([texture retain]);
GrBackendTexture backend_texture =
GrBackendTextures::MakeMtl(texture.width, texture.height, skgpu::Mipmapped::kNo, info);
return SkSurfaces::WrapBackendTexture(
context, backend_texture, origin, static_cast<int>(sample_cnt), color_type,
std::move(color_space), props, release_proc, release_context);
return SkSurfaces::WrapBackendTexture(context, backend_texture, origin, 1, color_type,
std::move(color_space), props, release_proc,
release_context);
}
} // namespace
GPUSurfaceMetalSkia::GPUSurfaceMetalSkia(GPUSurfaceMetalDelegate* delegate,
sk_sp<GrDirectContext> context,
MsaaSampleCount msaa_samples,
bool render_to_surface)
: delegate_(delegate),
render_target_type_(delegate->GetRenderTargetType()),
context_(std::move(context)),
msaa_samples_(msaa_samples),
render_to_surface_(render_to_surface) {
// If this preference is explicitly set, we allow for disabling partial repaint.
NSNumber* disablePartialRepaint =
@ -143,7 +140,6 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromCAMetalLayer(
auto surface = CreateSurfaceFromMetalTexture(context_.get(), drawable.get().texture,
kTopLeft_GrSurfaceOrigin, // origin
msaa_samples_, // sample count
kBGRA_8888_SkColorType, // color type
nullptr, // colorspace
nullptr, // surface properties
@ -215,8 +211,8 @@ std::unique_ptr<SurfaceFrame> GPUSurfaceMetalSkia::AcquireFrameFromMTLTexture(
}
sk_sp<SkSurface> surface = CreateSurfaceFromMetalTexture(
context_.get(), mtl_texture, kTopLeft_GrSurfaceOrigin, msaa_samples_, kBGRA_8888_SkColorType,
nullptr, nullptr, static_cast<SkSurfaces::TextureReleaseProc>(texture.destruction_callback),
context_.get(), mtl_texture, kTopLeft_GrSurfaceOrigin, kBGRA_8888_SkColorType, nullptr,
nullptr, static_cast<SkSurfaces::TextureReleaseProc>(texture.destruction_callback),
texture.destruction_context);
if (!surface) {

12
engine/src/flutter/shell/platform/android/android_context_gl_skia.cc
View File

@ -24,9 +24,7 @@ static EGLResult<EGLContext> CreateContext(EGLDisplay display,
return {context != EGL_NO_CONTEXT, context};
}
static EGLResult<EGLConfig> ChooseEGLConfiguration(EGLDisplay display,
uint8_t msaa_samples) {
EGLint sample_buffers = msaa_samples > 1 ? 1 : 0;
static EGLResult<EGLConfig> ChooseEGLConfiguration(EGLDisplay display) {
EGLint attributes[] = {
// clang-format off
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
@ -37,8 +35,6 @@ static EGLResult<EGLConfig> ChooseEGLConfiguration(EGLDisplay display,
EGL_ALPHA_SIZE, 8,
EGL_DEPTH_SIZE, 0,
EGL_STENCIL_SIZE, 0,
EGL_SAMPLES, static_cast<EGLint>(msaa_samples),
EGL_SAMPLE_BUFFERS, sample_buffers,
EGL_NONE, // termination sentinel
// clang-format on
};
@ -66,8 +62,7 @@ static bool TeardownContext(EGLDisplay display, EGLContext context) {
AndroidContextGLSkia::AndroidContextGLSkia(
fml::RefPtr<AndroidEnvironmentGL> environment,
const TaskRunners& task_runners,
uint8_t msaa_samples)
const TaskRunners& task_runners)
: AndroidContext(AndroidRenderingAPI::kSkiaOpenGLES),
environment_(std::move(environment)),
task_runners_(task_runners) {
@ -79,8 +74,7 @@ AndroidContextGLSkia::AndroidContextGLSkia(
bool success = false;
// Choose a valid configuration.
std::tie(success, config_) =
ChooseEGLConfiguration(environment_->Display(), msaa_samples);
std::tie(success, config_) = ChooseEGLConfiguration(environment_->Display());
if (!success) {
FML_LOG(ERROR) << "Could not choose an EGL configuration.";
LogLastEGLError();

3
engine/src/flutter/shell/platform/android/android_context_gl_skia.h
View File

@ -28,8 +28,7 @@ class AndroidEGLSurface;
class AndroidContextGLSkia : public AndroidContext {
public:
AndroidContextGLSkia(fml::RefPtr<AndroidEnvironmentGL> environment,
const TaskRunners& taskRunners,
uint8_t msaa_samples);
const TaskRunners& taskRunners);
~AndroidContextGLSkia();

33
engine/src/flutter/shell/platform/android/android_context_gl_unittests.cc
View File

@ -109,7 +109,7 @@ TEST(AndroidContextGl, Create) {
ThreadHost::Type::kIo));
TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
auto context =
std::make_unique<AndroidContextGLSkia>(environment, task_runners, 0);
std::make_unique<AndroidContextGLSkia>(environment, task_runners);
context->SetMainSkiaContext(main_context);
EXPECT_NE(context.get(), nullptr);
context.reset();
@ -141,7 +141,7 @@ TEST(AndroidContextGl, CreateSingleThread) {
TaskRunners(thread_label, platform_runner, platform_runner,
platform_runner, platform_runner);
auto context =
std::make_unique<AndroidContextGLSkia>(environment, task_runners, 0);
std::make_unique<AndroidContextGLSkia>(environment, task_runners);
context->SetMainSkiaContext(main_context);
EXPECT_NE(context.get(), nullptr);
context.reset();
@ -160,7 +160,7 @@ TEST(AndroidSurfaceGL, CreateSnapshopSurfaceWhenOnscreenSurfaceIsNotNull) {
ThreadHost::Type::kIo));
TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
auto android_context =
std::make_shared<AndroidContextGLSkia>(environment, task_runners, 0);
std::make_shared<AndroidContextGLSkia>(environment, task_runners);
auto android_surface =
std::make_unique<AndroidSurfaceGLSkia>(android_context);
auto window = fml::MakeRefCounted<AndroidNativeWindow>(
@ -187,7 +187,7 @@ TEST(AndroidSurfaceGL, CreateSnapshopSurfaceWhenOnscreenSurfaceIsNull) {
ThreadHost thread_host(host_config);
TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
auto android_context =
std::make_shared<AndroidContextGLSkia>(environment, task_runners, 0);
std::make_shared<AndroidContextGLSkia>(environment, task_runners);
auto android_surface =
std::make_unique<AndroidSurfaceGLSkia>(android_context);
EXPECT_EQ(android_surface->GetOnscreenSurface(), nullptr);
@ -195,29 +195,6 @@ TEST(AndroidSurfaceGL, CreateSnapshopSurfaceWhenOnscreenSurfaceIsNull) {
EXPECT_NE(android_surface->GetOnscreenSurface(), nullptr);
}
// TODO(https://github.com/flutter/flutter/issues/104463): Flaky test.
TEST(AndroidContextGl, DISABLED_MSAAx4) {
GrMockOptions main_context_options;
sk_sp<GrDirectContext> main_context =
GrDirectContext::MakeMock(&main_context_options);
auto environment = fml::MakeRefCounted<AndroidEnvironmentGL>();
std::string thread_label =
::testing::UnitTest::GetInstance()->current_test_info()->name();
ThreadHost thread_host(ThreadHost::ThreadHostConfig(
thread_label, ThreadHost::Type::kUi | ThreadHost::Type::kRaster |
ThreadHost::Type::kIo));
TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
auto context =
std::make_unique<AndroidContextGLSkia>(environment, task_runners, 4);
context->SetMainSkiaContext(main_context);
EGLint sample_count;
eglGetConfigAttrib(environment->Display(), context->Config(), EGL_SAMPLES,
&sample_count);
EXPECT_EQ(sample_count, 4);
}
TEST(AndroidContextGl, EnsureMakeCurrentChecksCurrentContextStatus) {
GrMockOptions main_context_options;
sk_sp<GrDirectContext> main_context =
@ -231,7 +208,7 @@ TEST(AndroidContextGl, EnsureMakeCurrentChecksCurrentContextStatus) {
ThreadHost::Type::kIo));
TaskRunners task_runners = MakeTaskRunners(thread_label, thread_host);
auto context =
std::make_unique<AndroidContextGLSkia>(environment, task_runners, 0);
std::make_unique<AndroidContextGLSkia>(environment, task_runners);
auto pbuffer_surface = context->CreatePbufferSurface();
auto status = pbuffer_surface->MakeCurrent();

3
engine/src/flutter/shell/platform/android/android_shell_holder.cc
View File

@ -118,8 +118,7 @@ AndroidShellHolder::AndroidShellHolder(
shell.GetTaskRunners(), // task runners
jni_facade, // JNI interop
shell.GetSettings()
.enable_software_rendering, // use software rendering
shell.GetSettings().msaa_samples // msaa sample count
.enable_software_rendering // use software rendering
);
weak_platform_view = platform_view_android->GetWeakPtr();
return platform_view_android;

6
engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
View File

@ -65,8 +65,6 @@ public class FlutterShellArgs {
public static final String ARG_KEY_OBSERVATORY_PORT = "observatory-port";
public static final String ARG_KEY_DART_FLAGS = "dart-flags";
public static final String ARG_DART_FLAGS = "--dart-flags";
public static final String ARG_KEY_MSAA_SAMPLES = "msaa-samples";
public static final String ARG_MSAA_SAMPLES = "--msaa-samples";
@NonNull
public static FlutterShellArgs fromIntent(@NonNull Intent intent) {
@ -143,10 +141,6 @@ public class FlutterShellArgs {
if (intent.getBooleanExtra(ARG_KEY_VERBOSE_LOGGING, false)) {
args.add(ARG_VERBOSE_LOGGING);
}
final int msaaSamples = intent.getIntExtra("msaa-samples", 0);
if (msaaSamples > 1) {
args.add("--msaa-samples=" + Integer.toString(msaaSamples));
}
// NOTE: all flags provided with this argument are subject to filtering
// based on a list of allowed flags in shell/common/switches.cc. If any

8
engine/src/flutter/shell/platform/android/platform_view_android.cc
View File

@ -63,7 +63,6 @@ std::unique_ptr<AndroidSurface> AndroidSurfaceFactoryImpl::CreateSurface() {
static std::shared_ptr<flutter::AndroidContext> CreateAndroidContext(
bool use_software_rendering,
const flutter::TaskRunners& task_runners,
uint8_t msaa_samples,
AndroidRenderingAPI android_rendering_api,
bool enable_vulkan_validation,
bool enable_opengl_gpu_tracing,
@ -81,8 +80,7 @@ static std::shared_ptr<flutter::AndroidContext> CreateAndroidContext(
case AndroidRenderingAPI::kSkiaOpenGLES:
return std::make_unique<AndroidContextGLSkia>(
fml::MakeRefCounted<AndroidEnvironmentGL>(), //
task_runners, //
msaa_samples //
task_runners //
);
}
FML_UNREACHABLE();
@ -92,8 +90,7 @@ PlatformViewAndroid::PlatformViewAndroid(
PlatformView::Delegate& delegate,
const flutter::TaskRunners& task_runners,
const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade,
bool use_software_rendering,
uint8_t msaa_samples)
bool use_software_rendering)
: PlatformViewAndroid(
delegate,
task_runners,
@ -101,7 +98,6 @@ PlatformViewAndroid::PlatformViewAndroid(
CreateAndroidContext(
use_software_rendering,
task_runners,
msaa_samples,
delegate.OnPlatformViewGetSettings().android_rendering_api,
delegate.OnPlatformViewGetSettings().enable_vulkan_validation,
delegate.OnPlatformViewGetSettings().enable_opengl_gpu_tracing,

3
engine/src/flutter/shell/platform/android/platform_view_android.h
View File

@ -46,8 +46,7 @@ class PlatformViewAndroid final : public PlatformView {
PlatformViewAndroid(PlatformView::Delegate& delegate,
const flutter::TaskRunners& task_runners,
const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade,
bool use_software_rendering,
uint8_t msaa_samples);
bool use_software_rendering);
//----------------------------------------------------------------------------
/// @brief Creates a new PlatformViewAndroid but using an existing

23
engine/src/flutter/shell/platform/android/test/io/flutter/embedding/engine/FlutterShellArgsTest.java
View File

@ -31,27 +31,4 @@ public class FlutterShellArgsTest {
assertTrue(argValues.contains("--dart-flags=--observe --no-hot --no-pub"));
assertTrue(argValues.contains("--trace-skia-allowlist=skia.a,skia.b"));
}
@Test
public void itHandles4xMsaaFlag() {
Intent intent = new Intent();
intent.putExtra("msaa-samples", 4);
FlutterShellArgs args = FlutterShellArgs.fromIntent(intent);
HashSet<String> argValues = new HashSet<String>(Arrays.asList(args.toArray()));
assertEquals(1, argValues.size());
assertTrue(argValues.contains("--msaa-samples=4"));
}
@Test
public void itHandles1xMsaaFlag() {
Intent intent = new Intent();
intent.putExtra("msaa-samples", 1);
FlutterShellArgs args = FlutterShellArgs.fromIntent(intent);
HashSet<String> argValues = new HashSet<String>(Arrays.asList(args.toArray()));
assertEquals(0, argValues.size());
}
}

32
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
View File

@ -96,38 +96,6 @@ flutter::FakeDelegate fake_delegate;
return weak_factory->GetWeakPtr();
}
- (void)testMsaaSampleCount {
if (fake_delegate.settings_.enable_impeller) {
// Default should be 4 for Impeller.
XCTAssertEqual(platform_view->GetIosContext()->GetMsaaSampleCount(), MsaaSampleCount::kFour);
} else {
// Default should be 1 for Skia.
XCTAssertEqual(platform_view->GetIosContext()->GetMsaaSampleCount(), MsaaSampleCount::kNone);
}
// Verify the platform view creates a new context with updated msaa_samples.
// Need to use Metal, since this is ignored for Software/GL.
fake_delegate.settings_.msaa_samples = 4;
auto thread_task_runner = fml::MessageLoop::GetCurrent().GetTaskRunner();
auto sync_switch = std::make_shared<fml::SyncSwitch>();
flutter::TaskRunners runners(/*label=*/self.name.UTF8String,
/*platform=*/thread_task_runner,
/*raster=*/thread_task_runner,
/*ui=*/thread_task_runner,
/*io=*/thread_task_runner);
auto msaa_4x_platform_view = std::make_unique<flutter::PlatformViewIOS>(
/*delegate=*/fake_delegate,
/*rendering_api=*/flutter::IOSRenderingAPI::kMetal,
/*platform_views_controller=*/nil,
/*task_runners=*/runners,
/*worker_task_runner=*/nil,
/*is_gpu_disabled_sync_switch=*/sync_switch);
XCTAssertEqual(msaa_4x_platform_view->GetIosContext()->GetMsaaSampleCount(),
MsaaSampleCount::kFour);
}
- (void)testCallsNotifyLowMemory {
FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"tester"];
XCTAssertNotNil(engine);

10
engine/src/flutter/shell/platform/darwin/ios/ios_context.h
View File

@ -8,7 +8,6 @@
#include <memory>
#include "flutter/common/graphics/gl_context_switch.h"
#include "flutter/common/graphics/msaa_sample_count.h"
#include "flutter/common/graphics/texture.h"
#include "flutter/fml/concurrent_message_loop.h"
#include "flutter/fml/macros.h"
@ -50,16 +49,12 @@ class IOSContext {
/// engine/platform.
/// @param[in] backend A client rendering backend supported by the
/// engine/platform.
/// @param[in] msaa_samples
/// The number of MSAA samples to use. Only supplied to
/// Skia, must be either 0, 1, 2, 4, or 8.
///
/// @return A valid context on success. `nullptr` on failure.
///
static std::unique_ptr<IOSContext> Create(
IOSRenderingAPI api,
IOSRenderingBackend backend,
MsaaSampleCount msaa_samples,
const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch);
//----------------------------------------------------------------------------
@ -145,13 +140,10 @@ class IOSContext {
virtual std::shared_ptr<impeller::Context> GetImpellerContext() const;
MsaaSampleCount GetMsaaSampleCount() const { return msaa_samples_; }
protected:
explicit IOSContext(MsaaSampleCount msaa_samples);
explicit IOSContext();
private:
MsaaSampleCount msaa_samples_ = MsaaSampleCount::kNone;
FML_DISALLOW_COPY_AND_ASSIGN(IOSContext);
};

6
engine/src/flutter/shell/platform/darwin/ios/ios_context.mm
View File

@ -14,14 +14,13 @@ FLUTTER_ASSERT_ARC
namespace flutter {
IOSContext::IOSContext(MsaaSampleCount msaa_samples) : msaa_samples_(msaa_samples) {}
IOSContext::IOSContext() = default;
IOSContext::~IOSContext() = default;
std::unique_ptr<IOSContext> IOSContext::Create(
IOSRenderingAPI api,
IOSRenderingBackend backend,
MsaaSampleCount msaa_samples,
const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch) {
switch (api) {
case IOSRenderingAPI::kSoftware:
@ -35,8 +34,7 @@ std::unique_ptr<IOSContext> IOSContext::Create(
switch (backend) {
case IOSRenderingBackend::kSkia:
#if !SLIMPELLER
return std::make_unique<IOSContextMetalSkia>(msaa_samples);
return std::make_unique<IOSContextMetalSkia>();
#else // !SLIMPELLER
FML_LOG(FATAL) << "Impeller opt-out unavailable.";
return nullptr;

3
engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_impeller.mm
View File

@ -12,8 +12,7 @@ namespace flutter {
IOSContextMetalImpeller::IOSContextMetalImpeller(
const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
: IOSContext(MsaaSampleCount::kFour),
darwin_context_metal_impeller_(fml::scoped_nsobject<FlutterDarwinContextMetalImpeller>{
: darwin_context_metal_impeller_(fml::scoped_nsobject<FlutterDarwinContextMetalImpeller>{
[[FlutterDarwinContextMetalImpeller alloc] init:is_gpu_disabled_sync_switch]}) {}
IOSContextMetalImpeller::~IOSContextMetalImpeller() = default;

2
engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_skia.h
View File

@ -20,7 +20,7 @@ namespace flutter {
class IOSContextMetalSkia final : public IOSContext {
public:
explicit IOSContextMetalSkia(MsaaSampleCount msaa_samples);
explicit IOSContextMetalSkia();
~IOSContextMetalSkia();

2
engine/src/flutter/shell/platform/darwin/ios/ios_context_metal_skia.mm
View File

@ -16,7 +16,7 @@ FLUTTER_ASSERT_ARC
namespace flutter {
IOSContextMetalSkia::IOSContextMetalSkia(MsaaSampleCount msaa_samples) : IOSContext(msaa_samples) {
IOSContextMetalSkia::IOSContextMetalSkia() {
darwin_context_metal_ = fml::scoped_nsobject<FlutterDarwinContextMetalSkia>{
[[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]};
}

2
engine/src/flutter/shell/platform/darwin/ios/ios_context_software.mm
View File

@ -9,7 +9,7 @@ FLUTTER_ASSERT_ARC
namespace flutter {
IOSContextSoftware::IOSContextSoftware() : IOSContext(MsaaSampleCount::kNone) {}
IOSContextSoftware::IOSContextSoftware() = default;
// |IOSContext|
IOSContextSoftware::~IOSContextSoftware() = default;

5
engine/src/flutter/shell/platform/darwin/ios/ios_surface_metal_skia.mm
View File

@ -51,9 +51,8 @@ void IOSSurfaceMetalSkia::UpdateStorageSizeIfNecessary() {
// |IOSSurface|
std::unique_ptr<Surface> IOSSurfaceMetalSkia::CreateGPUSurface(GrDirectContext* context) {
FML_DCHECK(context);
return std::make_unique<GPUSurfaceMetalSkia>(this, // delegate
sk_ref_sp(context), // context
GetContext()->GetMsaaSampleCount() // sample count
return std::make_unique<GPUSurfaceMetalSkia>(this, // delegate
sk_ref_sp(context) // context
);
}

18
engine/src/flutter/shell/platform/darwin/ios/platform_view_ios.mm
View File

@ -58,16 +58,14 @@ PlatformViewIOS::PlatformViewIOS(
const flutter::TaskRunners& task_runners,
const std::shared_ptr<fml::ConcurrentTaskRunner>& worker_task_runner,
const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
: PlatformViewIOS(
delegate,
IOSContext::Create(
rendering_api,
delegate.OnPlatformViewGetSettings().enable_impeller ? IOSRenderingBackend::kImpeller
: IOSRenderingBackend::kSkia,
static_cast<MsaaSampleCount>(delegate.OnPlatformViewGetSettings().msaa_samples),
is_gpu_disabled_sync_switch),
platform_views_controller,
task_runners) {}
: PlatformViewIOS(delegate,
IOSContext::Create(rendering_api,
delegate.OnPlatformViewGetSettings().enable_impeller
? IOSRenderingBackend::kImpeller
: IOSRenderingBackend::kSkia,
is_gpu_disabled_sync_switch),
platform_views_controller,
task_runners) {}
PlatformViewIOS::~PlatformViewIOS() = default;

10
engine/src/flutter/shell/platform/embedder/embedder.cc
View File

@ -939,12 +939,10 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
context, // context
backend_texture, // back-end texture
kTopLeft_GrSurfaceOrigin, // surface origin
// TODO(dnfield): Update this when embedders support MSAA, see
// https://github.com/flutter/flutter/issues/100392
1, // sample count
kBGRA_8888_SkColorType, // color type
nullptr, // color space
&surface_properties, // surface properties
1, // sample count
kBGRA_8888_SkColorType, // color type
nullptr, // color space
&surface_properties, // surface properties
static_cast<SkSurfaces::TextureReleaseProc>(
metal->texture.destruction_callback), // release proc
metal->texture.user_data // release context

4
engine/src/flutter/shell/platform/embedder/embedder_surface_metal.mm
View File

@ -8,7 +8,6 @@
#include "flutter/shell/platform/embedder/embedder_surface_metal.h"
#include "flutter/common/graphics/msaa_sample_count.h"
#include "flutter/fml/logging.h"
#include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
#include "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h"
@ -50,8 +49,7 @@ std::unique_ptr<Surface> EmbedderSurfaceMetal::CreateGPUSurface() API_AVAILABLE(
}
const bool render_to_surface = !external_view_embedder_;
auto surface = std::make_unique<GPUSurfaceMetalSkia>(this, main_context_, MsaaSampleCount::kNone,
render_to_surface);
auto surface = std::make_unique<GPUSurfaceMetalSkia>(this, main_context_, render_to_surface);
if (!surface->IsValid()) {
return nullptr;