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

Bump Mesa #42

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Bump Mesa #42

wants to merge 16 commits into from

Conversation

joske
Copy link

@joske joske commented Dec 4, 2023

No description provided.

Signed-off-by: Jos Dehaes <[email protected]>
@liberodark
Copy link

Hi,

You have try your bump before make a PR ?

Best Regards

@joske
Copy link
Author

joske commented Dec 5, 2023

Of course, it works on my machine. You probably need to have the kernel updated too though.

@mkurz
Copy link

mkurz commented Dec 5, 2023

@joske what machine are you using?

@joske
Copy link
Author

joske commented Dec 5, 2023

j313, M1 mba, but should work on all supported systems though

@mkurz
Copy link

mkurz commented Dec 5, 2023

hmm.. I am using J314sAP, but I think I will wait until marcan officially bumps the versions, because I don't have time to fix things if they are broken...
However I think it's good that you already prepare things for him 👍

@joske
Copy link
Author

joske commented Dec 5, 2023

It's quite simple to fix, but I understand you want to wait.

I'm trying to ease the burden of maintaining 2 distros for marcan.

Signed-off-by: Jos Dehaes <[email protected]>
@liberodark
Copy link

Thanks for the update

@mkurz
Copy link

mkurz commented Feb 12, 2024

@joske What's the reason you reverted from version 20240123? (I see you force-pushed https://github.com/AsahiLinux/PKGBUILDs/compare/f8c96ce3dc1a8deb1744a1b49ee3a7ef4ced8fdf..d7327be2aaffb6adf8ca65d35213ae4c51715dcb)

@joske
Copy link
Author

joske commented Feb 12, 2024

this was unstable (new uapi), unreleased in fedora asahi, and caused issues. For the same reason I downgraded the kernel back to -14 too.

@joske
Copy link
Author

joske commented Feb 12, 2024

apparently now mesa 20240123 is released in fedora asahi, but the kernel in fedora is not based on a tag in asahilinux/linux. The copr build is based on the fedora kernel release and a full patch applied against that with the asahi stuff. The latest tag in asahilinux/linux is asahi-6.6-15 but this is 6.6.0, and fedora has 6.6.3.

@joske
Copy link
Author

joske commented Feb 16, 2024

@mkurz this now has the latest opengl 4.6 support. Needs latest kernel though (6.6-15).

@kwankiu
Copy link

kwankiu commented Mar 26, 2024

@mkurz this now has the latest opengl 4.6 support. Needs latest kernel though (6.6-15).

I built your linux-asahi 6.6-15 and mesa-asahi-edge 20240214
But Mesa doesnt work, it shows llvmpipe (software rendering)
When I run glxinfo, it saids

MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so: cannot open shared object file: No such file or directory (search paths /usr/lib/dri, suffix _dri)
failed to load driver: zink

Signed-off-by: Jos Dehaes <[email protected]>
@EmmmaTech
Copy link

@mkurz this now has the latest opengl 4.6 support. Needs latest kernel though (6.6-15).

I built your linux-asahi 6.6-15 and mesa-asahi-edge 20240214 But Mesa doesnt work, it shows llvmpipe (software rendering) When I run glxinfo, it saids

MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so: cannot open shared object file: No such file or directory (search paths /usr/lib/dri, suffix _dri)
failed to load driver: zink

I have the exact same issue, and I'm using linux-asahi 6.6-16 & mesa-asahi-edge 20240228. When I used version 20230904 from the asahi-dev arch repo, hardware rendering had no issues.

@joske
Copy link
Author

joske commented Apr 15, 2024

@kwankiu @emretech did you rm -rf pkg src before building the package?

@EmmmaTech
Copy link

@kwankiu @emretech did you rm -rf pkg src before building the package?

I did, and I even configured the PKGBUILD to force build the Zink driver (it kept avoiding it for some reason) and now I get a new error when I try to run glxinfo -B:

MESA: error: ZINK: failed to choose pdev 
glx: failed to create drisw screen

I'm not sure why this fails...

@joske
Copy link
Author

joske commented Apr 16, 2024

I don't have /usr/lib/dri/zink_dri.so either, but glxinfo and hardware acceleration works anyway.

@EmmmaTech
Copy link

Oh... I'm not sure what's wrong then. glxinfo either complains about not being able to find Zink or failing to load Zink. I'm so confused on how my build requires Zink for hardware acceleration while yours doesn't. Are you using the exact same PKGBUILD?

@joske
Copy link
Author

joske commented Apr 16, 2024

Yes, I push to the PR exactly what I use.

@joske
Copy link
Author

joske commented Apr 16, 2024

You do switch branches when building mesa and kernel? They are on different branches.

@EmmmaTech
Copy link

I'm aware, and yes I have switched branches.

@mkurz
Copy link

mkurz commented May 14, 2024

haha it's working now!!!
There was a clang upgrade which fixed the issue:

$ yay -S clang
Sync Dependency (1): clang-17.0.6-2.1
resolving dependencies...
looking for conflicting packages...

Packages (1) clang-17.0.6-2.1

Total Installed Size:  249,40 MiB
Net Upgrade Size:       -2,24 MiB

:: Proceed with installation? [Y/n] 

Now it says:

$ pacman -Q | grep clang
clang 17.0.6-2.1
-clang 17.0.6-2
+clang 17.0.6-2.1

Wow.

@mkurz
Copy link

mkurz commented May 14, 2024

Sorry for all the noise and thanks for adding spirv-llvm-translator to the dependencies!

@mkurz mkurz mentioned this pull request May 15, 2024
@mkurz
Copy link

mkurz commented May 15, 2024

For the sake of completeness:
With the updated mesa-asahi-edge package from this pull request, together with the updated kernel packages (uboot-asahi, m1n1, linux-asahi) from #41, I now have OpenGL 4.6 working perfectly on my MacBook Pro (14-inch, M1 Pro, 2021) (J314sAP):

$ glxinfo | grep "OpenGL version"
OpenGL version string: 4.6 (Compatibility Profile) Mesa 24.1.0-devel

Thumbs up for @joske! 👍

@mkurz
Copy link

mkurz commented May 17, 2024

@joske Does it make sense to add the --no-pager change from

?
Does that has an advantage?

@joske
Copy link
Author

joske commented May 17, 2024

yes, I'll add that

Signed-off-by: Jos Dehaes <[email protected]>
Signed-off-by: Jos Dehaes <[email protected]>
@joske
Copy link
Author

joske commented Jun 1, 2024

@mkurz Thx, updated. I did run into some build issues with gallium-rusticl, so I disabled that for now.

@mkurz
Copy link

mkurz commented Jun 2, 2024

@mkurz Thx, updated. I did run into some build issues with gallium-rusticl, so I disabled that for now.

Hmm, might be related that Fedora is using llvm/clang 18 already while we are still on 17...(?) Let's wait until arch catches up and then let's see.

@mkurz
Copy link

mkurz commented Jul 26, 2024

BTW, with 20240725 you can now revert the changes from 06ff60e:

...
-    -D gallium-rusticl=false \
+    -D gallium-rusticl=true \
...
-  # _install fakeinstall/usr/lib/libRusticl*
+  _install fakeinstall/usr/lib/libRusticl*
...

For me this now compiles.

@mkurz
Copy link

mkurz commented Jul 28, 2024

mkurz and others added 3 commits July 28, 2024 23:10
Signed-off-by: Matthias Kurz <[email protected]>
Signed-off-by: Matthias Kurz <[email protected]>
@kwankiu
Copy link

kwankiu commented Oct 22, 2024

@mkurz I think you can enable the Vulkan driver when bumping to 20241006,

1usOS/PKGBUILDs@46ba472

btw, the mesa package is the only one that still has the -edge suffix, is it still necessary or should we rename it to just mesa-asahi?

@mkurz
Copy link

mkurz commented Oct 29, 2024

@kwankiu I see you did some work in https://github.com/1usOS/PKGBUILDs/tree/asahi/mesa-asahi
How about if you open a pull request here - against joske's mesa branch, so the changes end up in the this pull request eventually?

@mkurz
Copy link

mkurz commented Nov 4, 2024

(@kwankiu PR'ed myself here: joske#12)

mkurz and others added 5 commits November 4, 2024 12:18
Signed-off-by: Matthias Kurz <[email protected]>
Signed-off-by: Matthias Kurz <[email protected]>
bump to 20241104 + refactor (fixes emacs, xeyes, gitk)
@mkurz
Copy link

mkurz commented Nov 14, 2024

See

I plan to maintain a fork under https://github.com/asahi-alarm/PKGBUILDs and merge this PR there.
Any help is welcome, thanks!

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.

5 participants