[oe-core][PATCH] mesa: make asahi dependent on opencl

[oe-core][PATCH] mesa: make asahi dependent on opencl

[Markus Volk]

asahi not only depends on libclc but also requires rusticl

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta/recipes-graphics/mesa/mesa.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 5262b3001e..0caf5d0a18 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -102,7 +102,7 @@ PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
 PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
 
 VULKAN_DRIVERS_AMD = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',amd', '', d)}"
-VULKAN_DRIVERS_ASAHI = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc', ',asahi', '', d)}"
+VULKAN_DRIVERS_ASAHI = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc opencl', ',asahi', '', d)}"
 VULKAN_DRIVERS_INTEL = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',intel', '', d)}"
 VULKAN_DRIVERS_SWRAST = ",swrast"
 # Crashes on x32
@@ -170,7 +170,7 @@ GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', ''
 GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', '', d)}"
 
 # radeonsi requires LLVM
-GALLIUMDRIVERS_ASAHI = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc', ',asahi', '', d)}"
+GALLIUMDRIVERS_ASAHI = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc opencl', ',asahi', '', d)}"
 GALLIUMDRIVERS_IRIS = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',iris', '', d)}"
 GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',radeonsi', '', d)}"
 GALLIUMDRIVERS_LLVMPIPE = ",llvmpipe"
-- 
2.49.0

Re: [oe-core][PATCH] mesa: make asahi dependent on opencl

[Koen Kooi]

> Op 23 mei 2025, om 10:51 heeft Markus Volk <f_l_k@t-online.de> het volgende geschreven:
> 
> [...]
> # radeonsi requires LLVM
> -GALLIUMDRIVERS_ASAHI = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc', ',asahi', '', d)}"
> +GALLIUMDRIVERS_ASAHI = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc opencl', ',asahi', '', d)}"
> GALLIUMDRIVERS_IRIS = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',iris', '', d)}"
> GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',radeonsi', '', d)}"
> GALLIUMDRIVERS_LLVMPIPE = ",llvmpipe"

Very pedantic nit-pick: the comment for these 4 lines only talks about radeon-si, I think we should either remove that comment or properly mention asahi, iris and radeonsi and their dependencies.

regards,

Koen

Re: [oe-core][PATCH] mesa: make asahi dependent on opencl

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 1490 bytes --]

Like this?

# 'iris' and 'radeonsi' require LLVM, 'asahi' needs LLVM and 
additionally requires opencl (rust)

Personally I would vote for removal, because that seems 
self-explanatory enough to me. There is
no corresponding comment for vulkandrivers and the comment would also 
be outdated quite soon,
because mesa main branch has added a (by default) rusticl dependency to 
radeonsi as well

On Fri, May 23 2025 at 11:39:30 +02:00:00, Koen Kooi 
<koen.kooi@oss.qualcomm.com> wrote:
> 
> 
>>  Op 23 mei 2025, om 10:51 heeft Markus Volk <f_l_k@t-online.de 
>> <mailto:f_l_k@t-online.de>> het volgende geschreven:
>> 
>>  [...]
>>  # radeonsi requires LLVM
>>  -GALLIUMDRIVERS_ASAHI = "${@bb.utils.contains 
>> <mailto:${@bb.utils.contains>('PACKAGECONFIG', 'asahi libclc', 
>> ',asahi', '', d)}"
>>  +GALLIUMDRIVERS_ASAHI = "${@bb.utils.contains 
>> <mailto:${@bb.utils.contains>('PACKAGECONFIG', 'asahi libclc 
>> opencl', ',asahi', '', d)}"
>>  GALLIUMDRIVERS_IRIS = "${@bb.utils.contains 
>> <mailto:${@bb.utils.contains>('PACKAGECONFIG', 'intel libclc', 
>> ',iris', '', d)}"
>>  GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains 
>> <mailto:${@bb.utils.contains>('PACKAGECONFIG', 'amd', ',radeonsi', 
>> '', d)}"
>>  GALLIUMDRIVERS_LLVMPIPE = ",llvmpipe"
> 
> Very pedantic nit-pick: the comment for these 4 lines only talks 
> about radeon-si, I think we should either remove that comment or 
> properly mention asahi, iris and radeonsi and their dependencies.
> 
> regards,
> 
> Koen


[-- Attachment #2: Type: text/html, Size: 1777 bytes --]