From 750bc596e53e7a5bea5ed533b6843f3f903ac14e Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 13 Apr 2022 15:38:07 -0700 Subject: [PATCH 1/2] Add define for rendering --- BUILD.gn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index 01feaa41..b206c99e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -13,6 +13,10 @@ config("impeller_public_config") { defines += [ "IMPELLER_SUPPORTS_PLATFORM=1" ] } + if (impeller_supports_rendering) { + defines += [ "IMPELLER_SUPPORTS_RENDERING=1" ] + } + if (is_win) { defines += [ "_USE_MATH_DEFINES" ] } From 049a7cf2eef548a4ffe22dc224fffd1bdad21bf9 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 13 Apr 2022 16:02:10 -0700 Subject: [PATCH 2/2] Fix metal enum for older SDKs, add missing dep --- entity/BUILD.gn | 1 + renderer/backend/metal/command_buffer_mtl.mm | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/entity/BUILD.gn b/entity/BUILD.gn index d5062f30..51c2766d 100644 --- a/entity/BUILD.gn +++ b/entity/BUILD.gn @@ -87,6 +87,7 @@ impeller_component("entity_unittests") { deps = [ ":entity", + "../geometry:geometry_unittests", "../playground", ] } diff --git a/renderer/backend/metal/command_buffer_mtl.mm b/renderer/backend/metal/command_buffer_mtl.mm index ebdd3d2d..f5a96674 100644 --- a/renderer/backend/metal/command_buffer_mtl.mm +++ b/renderer/backend/metal/command_buffer_mtl.mm @@ -53,6 +53,18 @@ return CommandBufferMTL::Status::kError; } +// TODO(dnfield): remove this declaration when we no longer need to build on +// machines with lower SDK versions than 11.0.s +#if !defined(MAC_OS_X_VERSION_11_0) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_11_0 +typedef enum MTLCommandEncoderErrorState : NSInteger { + MTLCommandEncoderErrorStateUnknown = 0, + MTLCommandEncoderErrorStateCompleted = 1, + MTLCommandEncoderErrorStateAffected = 2, + MTLCommandEncoderErrorStatePending = 3, + MTLCommandEncoderErrorStateFaulted = 4, +} API_AVAILABLE(macos(11.0), ios(14.0)); +#endif + API_AVAILABLE(ios(14.0), macos(11.0)) NSString* MTLCommandEncoderErrorStateToString( MTLCommandEncoderErrorState state) {