Module: Mesa Branch: main Commit: b2da38413f5aaef0c225dcf730cfcd0d338d2f3e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2da38413f5aaef0c225dcf730cfcd0d338d2f3e
Author: Janne Grunau <j...@jannau.net> Date: Sun Nov 19 09:06:11 2023 +0100 gallium: Fix i915 pipe-loader build 'i915' was missing from the list of drivers for the 'driver_descriptor' descriptor symbol. Rather than maintaining a second list of drivers add the 'driver_descriptor' symbol for all drivers except swrast. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10171 Fixes: 667de678a06 ("gallium: Fix undefined symbols in version scripts") Signed-off-by: Janne Grunau <j...@jannau.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26273> --- src/gallium/targets/pipe-loader/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build index b288c2c73ac..b7a04c9d722 100644 --- a/src/gallium/targets/pipe-loader/meson.build +++ b/src/gallium/targets/pipe-loader/meson.build @@ -66,10 +66,9 @@ foreach x : pipe_loaders pipe_sym_config = configuration_data() foreach d : [[x[1] in ['r300', 'r600', 'radeonsi'], 'radeon_drm_winsys_create'], - [x[1] in ['vmwgfx', 'r600', 'r300', 'nouveau', 'msm', 'kmsro', 'iris', 'crocus', 'radeonsi'], - 'driver_descriptor'], [x[1] == 'radeonsi', 'amdgpu_winsys_create'], [x[1] == 'radeonsi' and with_llvm, 'ac_init_shared_llvm_once'], + [x[1] != 'swrast', 'driver_descriptor'], [x[1] == 'swrast', 'swrast_driver_descriptor']] if d[0] pipe_sym_config.set(d[1], d[1] + ';')
