Skip to content

Commit 276c091

Browse files
committed
overlay-debs/mesa-snapshot: enable relevant OpenCL drivers by default
Opt-in and use the gallium-rusticl-enable-drivers in order to enable RustiCL drivers which can be enabled by default: asahi, freedreno and radeonsi. The rest of the drivers still need an explicit RUSTICL_ENABLE environment variable. Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent e8fc407 commit 276c091

File tree

2 files changed

+45
-0
lines changed

2 files changed

+45
-0
lines changed

overlay-debs/mesa-snapshot/mesa-snapshot.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ mesa (${version}-0qcom1) testing; urgency=medium
3939
- debian/patches/path_max.diff: refresh
4040
- d/rules: dropped removal of mme_{fermi,tu104}_sim_hw_test
4141
- pull in NVK dependency, librust-rustc-hash-2-dev
42+
- opt-in and enable several OpenCL drivers by default: asahi, freedreno and
43+
radeonsi
4244
* Drop support for features removed upstream:
4345
- XA tracker, dropped packages: libxatracker2, libxatracker-dev.
4446
- D3D9 tracker, dropped packages libd3dadapter9-mesa,

overlay-debs/mesa-snapshot/mesa_25.2.0.debdiff

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,22 @@ diff -Nru mesa-25.2.0-orig/debian/rules mesa-25.2.0/debian/rules
282282
export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
283283

284284
export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
285+
@@ -46,6 +46,7 @@
286+
GALLIUM_DRIVERS = softpipe
287+
VULKAN_DRIVERS =
288+
VULKAN_LAYERS =
289+
+RUSTICL_ENABLE =
290+
291+
confflags_SSE2 = -Dsse2=true
292+
confflags_TEFLON = -Dteflon=false
293+
@@ -76,6 +77,7 @@
294+
# Freedreno requires arm in addition
295+
ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
296+
GALLIUM_DRIVERS += freedreno
297+
+ RUSTICL_ENABLE += freedreno
298+
endif
299+
300+
# etnaviv, tegra, vc4 and v3d kernel support are only available on armhf and arm64
285301
@@ -92,8 +92,6 @@
286302
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
287303
GALLIUM_DRIVERS += crocus i915 iris svga
@@ -291,6 +307,21 @@ diff -Nru mesa-25.2.0-orig/debian/rules mesa-25.2.0/debian/rules
291307
endif
292308

293309
ifneq (,$(filter $(DEB_HOST_ARCH), amd64))
310+
@@ -111,12 +113,14 @@
311+
ifneq (,$(filter $(DEB_HOST_ARCH), arm64 amd64 i386))
312+
GALLIUM_DRIVERS += asahi
313+
VULKAN_DRIVERS += asahi
314+
+ RUSTICL_ENABLE += asahi
315+
endif
316+
317+
# LLVM is required for building r300g, radeonsi and llvmpipe drivers.
318+
# It's also required for building OpenCL support.
319+
ifneq (,$(filter $(DEB_HOST_ARCH), $(LLVM_ARCHS)))
320+
GALLIUM_DRIVERS += radeonsi zink llvmpipe
321+
+ RUSTICL_ENABLE += radeonsi
322+
323+
# drop virtio from armel, it doesn't build
324+
ifneq (,$(filter $(DEB_HOST_ARCH), armel))
294325
@@ -129,7 +127,6 @@
295326

296327
VULKAN_LAYERS += device-select intel-nullhw overlay
@@ -311,6 +342,18 @@ diff -Nru mesa-25.2.0-orig/debian/rules mesa-25.2.0/debian/rules
311342
# gfxstream only builds on 64bit
312343
ifeq ($(DEB_HOST_ARCH_BITS),64)
313344
VULKAN_DRIVERS += gfxstream
345+
@@ -172,6 +176,11 @@
346+
VULKAN_DRIVERS_LIST := $(subst $(space),$(comma),$(VULKAN_DRIVERS))
347+
VULKAN_LAYERS := $(patsubst %,'%',$(VULKAN_LAYERS))
348+
VULKAN_LAYERS_LIST := $(subst $(space),$(comma),$(VULKAN_LAYERS))
349+
+RUSTICL_ENABLE := $(patsubst %,'%',$(RUSTICL_ENABLE))
350+
+RUSTICL_ENABLE_LIST := $(subst $(space),$(comma),$(RUSTICL_ENABLE))
351+
+ifneq (,$(filter $(DEB_HOST_ARCH), $(RUSTICL_ARCHS)))
352+
+confflags_GALLIUM += -Dgallium-rusticl-enable-drivers="[$(RUSTICL_ENABLE_LIST)]"
353+
+endif
354+
355+
confflags_GLES = -Dgles1=disabled -Dgles2=enabled
356+
confflags_GALLIUM += -Dgallium-drivers="[$(GALLIUM_DRIVERS_LIST)]"
314357
@@ -205,7 +197,7 @@
315358

316359
rewrite_wrap_files:

0 commit comments

Comments
 (0)