From 6e5d08c8e55d9da9d39d425c34ab963f6fb993ee Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 27 Feb 2026 09:57:21 +0100 Subject: [PATCH] gallium/dri: set LIBVA_DRIVERS_PATH in devenv We're setting this in the non-DRI codepath, but this was missed when we started embedding the VA driver into libgallium. This means we no longer were able to use VA-API from meson devenv, like we could before. Fixes: 212d57f7e67 ("targets/va: Build va driver into libgallium when building with dri") (cherry picked from commit 7e4744909b5a82aef0c2b031f18b552f965a2be1) Part-of: --- .pick_status.json | 2 +- src/gallium/targets/dri/meson.build | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index e77f123def8..ed59eba0199 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4394,7 +4394,7 @@ "description": "gallium/dri: set LIBVA_DRIVERS_PATH in devenv", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "212d57f7e6701a4f307c2c049a0e3eccfce58965", "notes": null diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 134d7e4adf8..412239f7b43 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -79,6 +79,8 @@ if with_gallium_va endif endforeach + devenv.set('LIBVA_DRIVERS_PATH', meson.current_build_dir()) + if va_drivers.length() > 0 meson.add_install_script( install_megadrivers,