Revert "drirc: move 00-$drv-defaults.conf to each driver's folder"

This reverts commit 97391328a3.

This broke devenv because DRIRC_CONFIGDIR doesn't point the folder that
contains everything anymore.

DRIRC_CONFIGDIR will be modified to take the standard `:`-separated list
of paths, but until then, revert this.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41890>
This commit is contained in:
Eric Engestrom 2026-05-29 15:59:19 +02:00 committed by Marge Bot
parent 9dfc83079c
commit 9be2f6ea57
24 changed files with 24 additions and 24 deletions

View file

@ -38,11 +38,11 @@ radv_drirc = custom_target(
'--import-path', join_paths(dir_source_root, 'src/util'),
'--drirc-src', '@OUTPUT0@',
'--drirc-hdr', '@OUTPUT1@',
'--validate', join_paths(dir_source_root, 'src/amd/vulkan/00-radv-defaults.conf'),
'--validate', join_paths(dir_source_root, 'src/util/00-radv-defaults.conf'),
],
depend_files : files(
join_paths(dir_source_root, 'src/util/drirc_gen.py'),
'00-radv-defaults.conf',
join_paths(dir_source_root, 'src/util/00-radv-defaults.conf'),
),
)

View file

@ -95,7 +95,7 @@ endif
libanv_drirc_files = custom_target(
'libanv_drirc',
input : ['anv_dricrc_gen.py', drirc_gen, '00-anv-defaults.conf'],
input : ['anv_dricrc_gen.py', drirc_gen, join_paths(dir_source_root, 'src/util/00-anv-defaults.conf')],
output : ['anv_drirc.c', 'anv_drirc.h'],
command : [prog_python, '@INPUT0@',
'-p', join_paths(dir_source_root, 'src/util/'),

View file

@ -214,27 +214,27 @@ endif
files_drirc = files('00-mesa-defaults.conf')
foreach i : [
[with_amd_vk, '../amd/vulkan/00-radv-defaults.conf'],
[with_intel_vk, '../intel/vulkan/00-anv-defaults.conf'],
[with_intel_hasvk, '../intel/vulkan_hasvk/00-hasvk-defaults.conf'],
[with_nouveau_vk, '../nouveau/vulkan/00-nvk-defaults.conf'],
[with_microsoft_vk, '../microsoft/vulkan/00-dzn-defaults.conf'],
[with_freedreno_vk, '../freedreno/vulkan/00-turnip-defaults.conf'],
[with_gallium_r300, '../gallium/drivers/r300/00-r300-defaults.conf'],
[with_gallium_iris, '../gallium/drivers/iris/00-iris-defaults.conf'],
[with_gallium_crocus, '../gallium/drivers/crocus/00-crocus-defaults.conf'],
[with_gallium_asahi, '../gallium/drivers/asahi/00-asahi-defaults.conf'],
[with_gallium_v3d, '../gallium/drivers/v3d/00-v3d-defaults.conf'],
[with_asahi_vk, '../asahi/vulkan/00-hk-defaults.conf'],
[with_panfrost_vk, '../panfrost/vulkan/00-panvk-defaults.conf'],
[with_gallium_virgl, '../gallium/drivers/virgl/00-virtio_gpu-defaults.conf'],
[with_gallium_panfrost, '../gallium/drivers/panfrost/00-panfrost-defaults.conf'],
[with_gallium_radeonsi, '../gallium/drivers/radeonsi/00-radeonsi-defaults.conf'],
[with_gallium_zink, '../gallium/drivers/zink/00-zink-defaults.conf'],
[with_gallium_r600, '../gallium/drivers/r600/00-r600-defaults.conf'],
[with_gallium_freedreno, '../gallium/drivers/freedreno/00-msm-defaults.conf'],
[with_gallium_d3d12, '../gallium/drivers/d3d12/00-d3d12-defaults.conf'],
[with_gallium_svga, '../gallium/drivers/svga/00-vmwgfx-defaults.conf'],
[with_amd_vk, '00-radv-defaults.conf'],
[with_intel_vk, '00-anv-defaults.conf'],
[with_intel_hasvk, '00-hasvk-defaults.conf'],
[with_nouveau_vk, '00-nvk-defaults.conf'],
[with_microsoft_vk, '00-dzn-defaults.conf'],
[with_freedreno_vk, '00-turnip-defaults.conf'],
[with_gallium_r300, '00-r300-defaults.conf'],
[with_gallium_iris, '00-iris-defaults.conf'],
[with_gallium_crocus, '00-crocus-defaults.conf'],
[with_gallium_asahi, '00-asahi-defaults.conf'],
[with_gallium_v3d, '00-v3d-defaults.conf'],
[with_asahi_vk, '00-hk-defaults.conf'],
[with_panfrost_vk, '00-panvk-defaults.conf'],
[with_gallium_virgl, '00-virtio_gpu-defaults.conf'],
[with_gallium_panfrost, '00-panfrost-defaults.conf'],
[with_gallium_radeonsi, '00-radeonsi-defaults.conf'],
[with_gallium_zink, '00-zink-defaults.conf'],
[with_gallium_r600, '00-r600-defaults.conf'],
[with_gallium_freedreno, '00-msm-defaults.conf'],
[with_gallium_d3d12, '00-d3d12-defaults.conf'],
[with_gallium_svga, '00-vmwgfx-defaults.conf'],
]
if i[0]
files_drirc += files(i[1])