Account for updated macro name in //flutter/fml/build_config.h (flutt…

…er#44)
egramond · Apr 27, 2022 · c11f408 · c11f408
1 parent 4e323c6
commit c11f408
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/impeller/geometry/matrix.h b/impeller/geometry/matrix.h
@@ -39,7 +39,7 @@ struct Matrix {
   };
 
   //----------------------------------------------------------------------------
-  /// Construts a default identity matrix.
+  /// Constructs a default identity matrix.
   ///
   constexpr Matrix()
       // clang-format off

diff --git a/impeller/renderer/allocator.cc b/impeller/renderer/allocator.cc
@@ -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
diff --git a/impeller/renderer/backend/metal/allocator_mtl.mm b/impeller/renderer/backend/metal/allocator_mtl.mm
@@ -32,15 +32,15 @@
 static MTLResourceOptions ToMTLResourceOptions(StorageMode type) {
   switch (type) {
     case StorageMode::kHostVisible:
-#if OS_IOS
+#if FML_OS_IOS
       return MTLResourceStorageModeShared;
 #else
       return MTLResourceStorageModeManaged;
 #endif
     case StorageMode::kDevicePrivate:
       return MTLResourceStorageModePrivate;
     case StorageMode::kDeviceTransient:
-#if OS_IOS
+#if FML_OS_IOS
       if (@available(iOS 10.0, *)) {
         return MTLResourceStorageModeMemoryless;
       } else {
@@ -57,15 +57,15 @@ 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;
 #endif
     case StorageMode::kDevicePrivate:
       return MTLStorageModePrivate;
     case StorageMode::kDeviceTransient:
-#if OS_IOS
+#if FML_OS_IOS
       if (@available(iOS 10.0, *)) {
         return MTLStorageModeMemoryless;
       } else {

diff --git a/impeller/renderer/backend/metal/device_buffer_mtl.mm b/impeller/renderer/backend/metal/device_buffer_mtl.mm
@@ -79,7 +79,7 @@
 // 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)];
   }

diff --git a/impeller/renderer/platform.h b/impeller/renderer/platform.h
@@ -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;