mesa-run: Use `meson devenv`

2 files changed, 2 insertions, 12 deletions

diff --git a/README.md b/README.md
index b400975..8452e74 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ A collection of scripts to build and test [Mesa](https://www.mesa3d.org/) withou
 ## Scripts
 
 - [nj](nj) - Run [ninja](https://github.com/ninja-build/ninja) from anywhere in the project git repository. (upstream: [nj repo](gitlab.freedesktop.org/kwg/nj))
-- [mesa-run](mesa-run) - helper script. Not used directly. Requires [jq](https://github.com/jqlang/jq)
+- [mesa-run](mesa-run) - helper script. Not used directly.
 - [mesa-debug](mesa-debug) - Debug build
 - [mesa-debug-asan](mesa-debug-asan) - Debug build with [AddressSanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer)
 - [mesa-debug-optimized](mesa-debug-optimized) - Debug build with optimization
diff --git a/mesa-run b/mesa-run
index 17a673b..97da05e 100755
--- a/mesa-run
+++ b/mesa-run
@@ -11,7 +11,6 @@ prefix="${builddir}"/install
 machine=$(uname -m)
 case "$machine" in
 x86_64)
-	vk_icd="intel_icd.${machine}.json"
 	vulkan_drivers=intel
 	gallium_drivers=iris
 	tools=drm-shim,intel
@@ -21,7 +20,6 @@ x86_64)
 	)
 	;;
 aarch64|arm*)
-	vk_icd="freedreno_icd.${machine}.json"
 	vulkan_drivers=freedreno
 	gallium_drivers=freedreno
 	tools=drm-shim,freedreno
@@ -68,12 +66,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}"
-LD_PRELOAD="${GCC_ASAN_PRELOAD}" exec "$@"
+LD_PRELOAD="${GCC_ASAN_PRELOAD}" exec meson devenv -C "${builddir}" -w "${PWD}" "$@"