summaryrefslogtreecommitdiff
path: root/mesa-run
diff options
context:
space:
mode:
Diffstat (limited to 'mesa-run')
-rwxr-xr-xmesa-run60
1 files changed, 39 insertions, 21 deletions
diff --git a/mesa-run b/mesa-run
index 1f8c2d9..274c18b 100755
--- a/mesa-run
+++ b/mesa-run
@@ -8,17 +8,19 @@ die() {
[[ -z ${builddir} ]] && die "builddir must be set"
prefix="${builddir}"/install
+IFS=: read -r -a extra_args <<< "${extra_args}"
+
machine=$(uname -m)
case "$machine" in
x86_64)
- vk_icd="intel_icd.${machine}.json"
vulkan_drivers=intel
gallium_drivers=iris
tools=drm-shim,intel
- extra_args+=(-Dintel-clc=enabled)
+ extra_args+=(
+ -Dintel-rt=disabled
+ )
;;
aarch64|arm*)
- vk_icd="freedreno_icd.${machine}.json"
vulkan_drivers=freedreno
gallium_drivers=freedreno
tools=drm-shim,freedreno
@@ -28,35 +30,59 @@ esac
case "$1" in
wipe|wipeout)
echo "Removing ${builddir}"
- exec meson setup --wipe "${builddir}"
- ;;
+ rm -r "${builddir}"
+ ;&
configure)
- export LLVM_MAJOR_VERSION="16"
- export LLVM_CONFIG="/usr/lib/llvm/${LLVM_MAJOR_VERSION}/bin/llvm-config"
+ export LLVM_MAJOR_VERSION="20"
+ llvm_config_paths=(
+ "/usr/bin/llvm-config-${LLVM_MAJOR_VERSION}"
+ "/usr/lib/llvm/${LLVM_MAJOR_VERSION}/bin/llvm-config"
+ )
+ for llvm_config in "${llvm_config_paths[@]}"; do
+ if [[ -x "${llvm_config}" ]]; then
+ export LLVM_CONFIG="${llvm_config}"
+ break
+ fi
+ done
+
+ llvm_pkg_config_paths=(
+ "/usr/lib/llvm/${LLVM_MAJOR_VERSION}/lib64/pkgconfig"
+ "/usr/lib/x86_64-linux-gnu/pkgconfig"
+ )
+ for llvm_pkg_config_path in "${llvm_pkg_config_paths[@]}"; do
+ if [[ -f "${llvm_pkg_config_path}/LLVMSPIRVLib.pc" ]]; then
+ export LLVM_CONFIG="${llvm_config}"
+ spirv_llvm_translator_pkg_config_path="${llvm_pkg_config_path}"
+ break
+ fi
+ done
+
#export CC="/usr/lib/llvm/${LLVM_MAJOR_VERSION}/bin/clang"
#export CXX="/usr/lib/llvm/${LLVM_MAJOR_VERSION}/bin/clang++"
#export CC_LD="/usr/lib/llvm/${LLVM_MAJOR_VERSION}/bin/lld"
#export CXX_LD="${CC_LD}"
+ export CC_LD="mold"
+ export CXX_LD="mold"
args=(
- --pkg-config-path "/usr/lib/llvm/${LLVM_MAJOR_VERSION}/lib64/pkgconfig"
+ --pkg-config-path "${spirv_llvm_translator_pkg_config_path}"
-Dprefix="${prefix}"
-Dc_args="${cflags}"
-Dcpp_args="${cxxflags}"
-Dtools="${tools}"
- -Dbuild-tests=true
+ -Dbuild-tests=false
-Dvulkan-drivers="${vulkan_drivers}"
-Dgallium-drivers="${gallium_drivers}"
-Dgallium-rusticl=false
- -Dgallium-va=auto
- -Dgallium-xa=disabled
- -Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc"
+ -Dgallium-va=disabled
+ -Dintel-elk=false
-Dvulkan-beta=true
-Dbuildtype="${buildtype}"
-Dbackend=ninja
"${extra_args[@]}"
"${builddir}"
)
+ echo meson setup --reconfigure "${args[@]}"
exec meson setup --reconfigure "${args[@]}"
;;
build)
@@ -64,12 +90,4 @@ build)
;;
esac
-if ! command -v jq &> /dev/null; then
- die "jq needs to be installed"
-fi
-
-libdir=$(jq -r '.[] | select(.name == "libdir").value' "${builddir}"/meson-info/intro-buildoptions.json)
-export LD_LIBRARY_PATH="${prefix}/${libdir}:${LD_LIBRARY_PATH}"
-export LIBGL_DRIVERS_PATH="${prefix}/${libdir}"/dri
-export VK_ICD_FILENAMES="${prefix}"/share/vulkan/icd.d/"${vk_icd}"
-exec "$@"
+LD_PRELOAD="${GCC_ASAN_PRELOAD}" exec meson devenv -C "${builddir}" -w "${PWD}" "$@"