Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS moltenVK support and SIGBUS handling #11252

Merged
merged 8 commits into from Dec 12, 2021
Merged

Conversation

nastys
Copy link
Contributor

@nastys nastys commented Dec 10, 2021

This adds the bare minimum graphics workarounds (disabling logicOp, renaming select -> selection, disabling native triangle fan) and trivial fixes to the Cmake file, SIGBUS handling, and removes the thread check in main.cpp
Texture/surface format workarounds are not included.

@Megamouse Megamouse added Build and CI Anything related to the build process and continuous integration OS: Mac Render: Vulkan RSX labels Dec 10, 2021
@Megamouse Megamouse requested a review from kd-11 December 10, 2021 22:38
rpcs3/main.cpp Outdated Show resolved Hide resolved
@@ -130,8 +130,9 @@ LOG_CHANNEL(q_debug, "QDEBUG");
dlg.exec();
};

#ifdef __APPLE__
#if defined(__APPLE__) && defined(BLOCKS) // BLOCKS is required for dispatch_sync, but GCC-11 does not support it
// Cocoa access is not allowed outside of the main thread
Copy link
Member

Choose a reason for hiding this comment

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

Can you pass []{ show_report(text); } lambda instead?

Copy link
Contributor

Choose a reason for hiding this comment

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

He can't compile it, that's why he added the ifdef for BLOCK.
Or can you confirm it compiles?

Copy link
Member

Choose a reason for hiding this comment

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

I'm just wondering if lambdas can be used instead of alien ^{} syntax, I think I saw some examples in wild.

Copy link
Contributor

Choose a reason for hiding this comment

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

We won't know in this PR, as the author uses gcc11

@Megamouse Megamouse merged commit 08333e0 into RPCS3:master Dec 12, 2021
kd-11 pushed a commit to kd-11/rpcs3 that referenced this pull request Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build and CI Anything related to the build process and continuous integration OS: Mac Render: Vulkan RSX
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants