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

Account for updated macro name in //flutter/fml/build_config.h (flutter/engine#44)

Browse Source
This commit is contained in:
Chinmay Garde 2022-02-28 13:52:11 -08:00 committed by Dan Field
parent 34af9e57f1
commit 7cc6c2588a
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/impeller/geometry/matrix.h
View File

@ -39,7 +39,7 @@ struct Matrix {
};
//----------------------------------------------------------------------------
/// Construts a default identity matrix.
/// Constructs a default identity matrix.
///
constexpr Matrix()
// clang-format off

6
engine/src/flutter/impeller/renderer/allocator.cc
View File

@ -15,13 +15,13 @@ bool Allocator::RequiresExplicitHostSynchronization(StorageMode mode) {
return false;
}
#if OS_IOS
#if FML_OS_IOS
// StorageMode::kHostVisible is MTLStorageModeShared already.
return false;
#else // OS_IOS
#else // FML_OS_IOS
// StorageMode::kHostVisible is MTLResourceStorageModeManaged.
return true;
#endif // OS_IOS
#endif // FML_OS_IOS
}
} // namespace impeller

8
engine/src/flutter/impeller/renderer/backend/metal/allocator_mtl.mm
View File

@ -32,7 +32,7 @@ bool AllocatorMTL::IsValid() const {
static MTLResourceOptions ToMTLResourceOptions(StorageMode type) {
switch (type) {
case StorageMode::kHostVisible:
#if OS_IOS
#if FML_OS_IOS
return MTLResourceStorageModeShared;
#else
return MTLResourceStorageModeManaged;
@ -40,7 +40,7 @@ static MTLResourceOptions ToMTLResourceOptions(StorageMode type) {
case StorageMode::kDevicePrivate:
return MTLResourceStorageModePrivate;
case StorageMode::kDeviceTransient:
#if OS_IOS
#if FML_OS_IOS
if (@available(iOS 10.0, *)) {
return MTLResourceStorageModeMemoryless;
} else {
@ -57,7 +57,7 @@ static MTLResourceOptions ToMTLResourceOptions(StorageMode type) {
static MTLStorageMode ToMTLStorageMode(StorageMode mode) {
switch (mode) {
case StorageMode::kHostVisible:
#if OS_IOS
#if FML_OS_IOS
return MTLStorageModeShared;
#else
return MTLStorageModeManaged;
@ -65,7 +65,7 @@ static MTLStorageMode ToMTLStorageMode(StorageMode mode) {
case StorageMode::kDevicePrivate:
return MTLStorageModePrivate;
case StorageMode::kDeviceTransient:
#if OS_IOS
#if FML_OS_IOS
if (@available(iOS 10.0, *)) {
return MTLStorageModeMemoryless;
} else {

2
engine/src/flutter/impeller/renderer/backend/metal/device_buffer_mtl.mm
View File

@ -79,7 +79,7 @@ std::shared_ptr<Texture> DeviceBufferMTL::MakeTexture(TextureDescriptor desc,
// Making this call is never necessary on iOS because there is no
// MTLResourceStorageModeManaged mode. Only the MTLStorageModeShared mode is
// available.
#if !OS_IOS
#if !FML_OS_IOS
if (Allocator::RequiresExplicitHostSynchronization(mode_)) {
[buffer_ didModifyRange:NSMakeRange(offset, source_range.length)];
}

2
engine/src/flutter/impeller/renderer/platform.h
View File

@ -12,7 +12,7 @@
namespace impeller {
constexpr size_t DefaultUniformAlignment() {
#if OS_IOS
#if FML_OS_IOS
return 16u;
#elif FML_OS_MACOSX
return 256u;