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

yuzu: update, switch to qt6, clean up, etc #228872

Merged
merged 1 commit into from
May 10, 2023
Merged

Conversation

K900
Copy link
Contributor

@K900 K900 commented Apr 29, 2023

Description of changes

Testing appreciated. Vulkan updates are in staging-next.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@K900
Copy link
Contributor Author

K900 commented May 1, 2023

staging-next merged, this should be a lot easier to test now.

@sbruder
Copy link
Contributor

sbruder commented May 1, 2023

Thanks for picking this up!

I just tested it on two machines and it worked quite well.

With OpenGL, everything I tested worked, Vulkan crashed after a short time on Intel Arc (but worked on AMD Vega), though I don’t think that is something we can fix in nixpkgs.

While yuzu should now support Wayland, that requires qtwayland to be used as a build input, otherwise it doesn’t find the platform plugin. However, when I tried compiling it like that, with OpenGL everything had darker colours (like it had a wrong gamma value) and with Vulkan it crashed after a short time, though I’m not sure if it works for other people.
I think we should either force QT_QPA_PLATFORM to xcb again (because without qtwayland, it doesn’t start on Wayland), or build it with qtwayland (and hope that it works for most people).

Also, nice that you could find the git metadata for the early-access branch, so we can reconstruct the source exactly. Because the source in pineapple’s repository is only tested on their build pipeline, we had problems using it in the past.

@K900
Copy link
Contributor Author

K900 commented May 1, 2023

It should pick up qtwayland ambiently if you're running it in a Wayland session, though it might be worth adding to the wrapper as well.

@sbruder
Copy link
Contributor

sbruder commented May 1, 2023

I am using sway and also tried adding qtwayland to my user packages and system packages, but in both cases, it didn’t find the plugin.

It’s possible that there is something wrong with my configuration, because I had the same problem with Anki. However, other people had the same problem which lead to the inclusion of qtwayland in the build inputs (reasoning, including references to discussions about similar problems).

@K900
Copy link
Contributor Author

K900 commented May 1, 2023

Let's just add it to the wrapper then.

@K900
Copy link
Contributor Author

K900 commented May 1, 2023

Updated to current release while I'm at it.

@K900 K900 changed the title yuzu: update, switch to qt6,clean up, etc yuzu: update, switch to qt6, clean up, etc May 1, 2023
@K900
Copy link
Contributor Author

K900 commented May 1, 2023

Also, tested a bit more - on 680M (Rembrandt iGPU), 6700S (Navi 23 mobile) and 6800XT (Navi 21 desktop), seems fine for me in both modes, no weird crashing, no weird colors on Gamescope or Plasma.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 and removed 10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000 labels May 1, 2023
@sbruder
Copy link
Contributor

sbruder commented May 1, 2023

Hm, then this must have been an issue on my end. Thanks for testing it.

@K900
Copy link
Contributor Author

K900 commented May 2, 2023

Updated again since a bunch of perf fixes got merged to mainline. We should really set up an auto-updating flake for this...

@aidalgol aidalgol removed their request for review May 2, 2023 09:11
Copy link
Member

@athre0z athre0z left a comment

Choose a reason for hiding this comment

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

Works great here (NixOS, x86_64-linux). Thanks for the update!

@dmayle
Copy link
Contributor

dmayle commented May 4, 2023

Trying to install here, if I don't manage, I'll test it once it's merged

@dmayle
Copy link
Contributor

dmayle commented May 4, 2023

Tested as working over here, thanks for this!

@K900
Copy link
Contributor Author

K900 commented May 5, 2023

So, should I do another update and then merge this?

@K900
Copy link
Contributor Author

K900 commented May 5, 2023

Updated to latest versions, supposedly there's some more optimizations.

@baduhai
Copy link
Contributor

baduhai commented May 6, 2023

Working beautifully for me, the updates brought some great optimisations to the game I want to play 😉.

@lheckemann lheckemann merged commit cf4f8bf into NixOS:master May 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants