Skip to content
This repository was archived by the owner on Apr 29, 2022. It is now read-only.

Build fixes for roll #135

Merged
dnfield merged 2 commits into from
Apr 13, 2022
Merged

Build fixes for roll #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
750bc59
Add define for rendering
dnfield Apr 13, 2022
049a7cf
Fix metal enum for older SDKs, add missing dep
dnfield Apr 13, 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
4 changes: 4 additions & 0 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
Expand Down
1 change: 1 addition & 0 deletions entity/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ impeller_component("entity_unittests") {

deps = [
":entity",
"../geometry:geometry_unittests",
"../playground",
]
}
12 changes: 12 additions & 0 deletions renderer/backend/metal/command_buffer_mtl.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@jmagman jmagman Apr 14, 2022

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

What exactly are you trying to do? Does API_AVAILABLE(macos(11.0)) work? Do you need an iOS availability constraint as MTLCommandEncoderErrorStateToString has API_AVAILABLE(ios(14.0), macos(11.0))

@dnfield dnfield Apr 14, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

See more of this continued in #136.

I'm trying to make sure that if we end up on a bot that has an older SDK that does not define this enum, we can still compile.

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) {
Expand Down