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

Support for Vulkan 1.4 #1665

Merged
merged 1 commit into from
Dec 7, 2024
Merged

Support for Vulkan 1.4 #1665

merged 1 commit into from
Dec 7, 2024

Conversation

Xphalnos
Copy link
Contributor

@Xphalnos Xphalnos commented Dec 4, 2024

@raphaelthegreat
Copy link
Collaborator

Unless we actually use vulkan 1.4, I don't think updating find_package is a good idea, as it will prevent some linux distros that are not cutting edge from using system headers. @abouvier probably knows more on this subject

@gandalfthewhite19890404
Copy link

Hardware requirements gonna be raised? What GPU now we should have?

@raphaelthegreat
Copy link
Collaborator

This doesn't raise minimum vulkan version emulator requires (that will still be 1.2), but rather updates library headers to allow emulator to use vulkan 1.4 in the future. In summary this is mostly on cosmetic side so not much to worry about

@@ -123,6 +123,7 @@ endif()
# MagicEnum
if (NOT TARGET magic_enum::magic_enum)
add_subdirectory(magic_enum)
target_include_directories(magic_enum INTERFACE magic_enum/include/magic_enum)
Copy link
Contributor

@abouvier abouvier Dec 6, 2024

Choose a reason for hiding this comment

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

Headers are now installed in /usr/include/magic_enum/magic_enum.hpp. You should edit all *.cpp files, replacing #include <magic_enum.hpp> with #include <magic_enum/magic_enum.hpp> instead. Using system magic_enum lib will fail otherwise.

@abouvier
Copy link
Contributor

abouvier commented Dec 6, 2024

Unless we actually use vulkan 1.4, I don't think updating find_package is a good idea, as it will prevent some linux distros that are not cutting edge from using system headers. @abouvier probably knows more on this subject

It's fine, old distros will fallback on external headers. Otherwise, without the source code change, it's the rolling distros that will not be able to compile with the latest system headers. Newer distros should be privileged :)

@Xphalnos
Copy link
Contributor Author

Xphalnos commented Dec 6, 2024

I have made the requested changes!

@Xphalnos
Copy link
Contributor Author

Xphalnos commented Dec 7, 2024

@raphaelthegreat Any news? The changes that were requested have been applied and approved.

@raphaelthegreat
Copy link
Collaborator

Yes it looks okay now, thanks for the upgrade

@raphaelthegreat raphaelthegreat merged commit 2266622 into shadps4-emu:main Dec 7, 2024
10 checks passed
@abouvier
Copy link
Contributor

abouvier commented Dec 7, 2024

Oops, you should have raised the version constraint of magic_enum too: find_package(magic_enum 0.9.7 CONFIG).

rainmakerv3 pushed a commit to rainmakerv3/shadPS4 that referenced this pull request Dec 7, 2024
Xcedf added a commit to Xcedf/shadPS4 that referenced this pull request Dec 9, 2024
This reverts commit 119e03c.

Revert "shader_recompiler: Implement V_LSHL_B64 for immediate arguments. (shadps4-emu#1674)"

This reverts commit c076ba6.

Revert "Fix + documentation update (shadps4-emu#1689)"

This reverts commit 57e7624.

Revert "Support for Vulkan 1.4 (shadps4-emu#1665)"

This reverts commit 2266622.
Xcedf pushed a commit to Xcedf/shadPS4 that referenced this pull request Dec 10, 2024
Xcedf pushed a commit to Xcedf/shadPS4 that referenced this pull request Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants