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

Jump to bottom

Cmake option to enable/disable vulkan video backend #7395

Merged
merged 1 commit into from Oct 23, 2020
Merged

Cmake option to enable/disable vulkan video backend #7395

merged 1 commit into from Oct 23, 2020
+16 −3

Conversation

mazes-80
Copy link

@mazes-80 mazes-80 commented Sep 3, 2018

Allows build system to skip vulkan video backend at compile time.
Useful for "weak" hardware were vulkan is unsupported

riking
riking suggested changes Sep 3, 2018
View reviewed changes
CMakeLists.txt Outdated
@@ -536,7 +537,13 @@ endif()
#
add_subdirectory(Externals/Bochs_disasm)
add_subdirectory(Externals/cpp-optparse)
add_subdirectory(Externals/glslang)
if(NOT APPLE)

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

@jordan-woyak
Copy link
Member

Can you rebase this, please?

@mazes-80
Copy link
Author

Rebase done

spotlightishere
spotlightishere reviewed Jul 21, 2020
View reviewed changes
CMakeLists.txt Outdated
if(APPLE)
set(ENABLE_VULKAN 0)
endif()
Copy link
Contributor

Choose a reason for hiding this comment

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

Support for macOS and Vulkan via MoltenVK was added after this PR was made (Nov. 2019, see 673f196) so this clause and the two !defined(__APPLE__)s below should be able to be safely removed! I tested this removal locally to confirm things build sanely.

Forgot to add as a reviewable comment to minimize - all seems good!

jordan-woyak
jordan-woyak approved these changes Jul 21, 2020
View reviewed changes
Copy link
Member

@jordan-woyak jordan-woyak left a comment

Choose a reason for hiding this comment

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

Changes look fine to me. But I'm no cmake expert.

@JosJuice
Copy link
Member

JosJuice commented Sep 6, 2020 •
edited

A new function VideoBackendBase::GetDefaultBackendName was added to Dolphin very recently. It should be updated in a similar way to how you updated VideoBackendBase::PopulateList.

EDIT: Fixed by @leoetlino's rebase.

@leoetlino leoetlino merged commit 271676a into dolphin-emu:master Oct 23, 2020
10 checks passed
@mazes-80 mazes-80 deleted the 11374 branch October 23, 2020 19:30
This was referenced Oct 23, 2020
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spotlightishere spotlightishere spotlightishere left review comments

@riking riking riking requested changes

@jordan-woyak jordan-woyak jordan-woyak approved these changes

@iwubcode iwubcode iwubcode approved these changes

Assignees
No one assigned
Labels
needs rebase
Milestone
No milestone
7 participants
@mazes-80 @jordan-woyak @JosJuice @riking @spotlightishere @iwubcode @leoetlino