Skip to content

Commit

Permalink
mesa-aco: Try to enable rusticl
Browse files Browse the repository at this point in the history
Fixes #14
  • Loading branch information
ernstp committed Feb 22, 2023
1 parent 884e34f commit 3f46bf8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions mesa-aco/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@ Build-Depends:
libclang-15-dev | libclang-14-dev | libclang-13-dev | libclang-12-dev,
libclang-cpp15-dev | libclang-cpp14-dev | libclang-cpp13-dev | libclang-cpp12-dev,
libclc-15-dev | libclc-14-dev | libclc-13-dev | libclc-12-dev,
libllvmspirvlib-15-dev | libllvmspirvlib-14-dev | libllvmspirvlib-13-dev | libllvmspirvlib-12-dev,
wayland-protocols (>= 1.24),
zlib1g-dev,
libglvnd-core-dev (>= 1.3.2),
valgrind [amd64 arm64 armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x],
bindgen | build-essential,
rustc,
Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa
Homepage: https://mesa3d.org/
Expand Down
2 changes: 2 additions & 0 deletions mesa-aco/debian/mesa-opencl-icd.install
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
etc/OpenCL/vendors/mesa.icd
etc/OpenCL/vendors/rusticl.icd
usr/lib/*/gallium-pipe/*.so
usr/lib/*/libMesaOpenCL*
usr/lib/*/libRusticlOpenCL*
6 changes: 6 additions & 0 deletions mesa-aco/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)

dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
DEB_DISTRIBUTION = $(call dpkg_late_eval,DEB_DISTRIBUTION,dpkg-parsechangelog -SDistribution)

# for finding the correct llvm-config when meson doesn't know about it yet
export PATH:=/usr/lib/llvm-15/bin/:/usr/lib/llvm-14/bin/:/usr/lib/llvm-13/bin/:/usr/lib/llvm-12/bin/:/usr/lib/llvm-11/bin/:$(PATH)

Expand Down Expand Up @@ -125,6 +128,9 @@ else
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += -Dllvm=enabled
confflags_GALLIUM += -Dgallium-opencl=icd
ifneq ($(DEB_DISTRIBUTION),focal)
confflags_GALLIUM += -Dgallium-rusticl=true
endif

# nine makes sense only on archs that build wine
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 powerpc))
Expand Down

0 comments on commit 3f46bf8

Please sign in to comment.