From ab7f518ed04f72e4d35797d5ee4971cd4004966f Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 30 Nov 2022 10:12:38 +0100 Subject: [PATCH] radv,driconf: fix static driconf by parsing 00-radv-defaults.conf Otherwise when xmlconfig is disabled, drirc workarounds aren't applied with RADV. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7785 Signed-off-by: Samuel Pitoiset Reviewed-by: Eric Engestrom Reviewed-by: Dylan Baker Part-of: --- src/amd/vulkan/meson.build | 7 ------- src/{amd/vulkan => util}/00-radv-defaults.conf | 0 src/util/meson.build | 4 ++++ 3 files changed, 4 insertions(+), 7 deletions(-) rename src/{amd/vulkan => util}/00-radv-defaults.conf (100%) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 002296b..e7872e6 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -100,13 +100,6 @@ libradv_files = files( 'vk_format.h', ) -files_drirc = files('00-radv-defaults.conf') - -# Only install the drirc file if we build with support for parsing drirc files -if use_xmlconfig - install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d')) -endif - if not with_platform_windows libradv_files += files( 'winsys/amdgpu/radv_amdgpu_bo.c', diff --git a/src/amd/vulkan/00-radv-defaults.conf b/src/util/00-radv-defaults.conf similarity index 100% rename from src/amd/vulkan/00-radv-defaults.conf rename to src/util/00-radv-defaults.conf diff --git a/src/util/meson.build b/src/util/meson.build index 88f1090..6a5881b 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -172,6 +172,10 @@ files_mesa_util = files( files_drirc = files('00-mesa-defaults.conf') +if with_amd_vk + files_drirc += files('00-radv-defaults.conf') +endif + if with_tests prog_xmllint = find_program('xmllint', required : false, native : true) if prog_xmllint.found() -- 2.7.4