From 9be2f6ea579d52848ece1a9a9469766f70228ff8 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 29 May 2026 15:59:19 +0200 Subject: [PATCH] Revert "drirc: move 00-$drv-defaults.conf to each driver's folder" This reverts commit 97391328a38b3edb8df3cc9507e34808b8111457. 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: --- src/amd/vulkan/meson.build | 4 +- src/intel/vulkan/meson.build | 2 +- .../vulkan => util}/00-anv-defaults.conf | 0 .../asahi => util}/00-asahi-defaults.conf | 0 .../crocus => util}/00-crocus-defaults.conf | 0 .../d3d12 => util}/00-d3d12-defaults.conf | 0 .../vulkan => util}/00-dzn-defaults.conf | 0 .../00-hasvk-defaults.conf | 0 .../vulkan => util}/00-hk-defaults.conf | 0 .../iris => util}/00-iris-defaults.conf | 0 .../freedreno => util}/00-msm-defaults.conf | 0 .../vulkan => util}/00-nvk-defaults.conf | 0 .../00-panfrost-defaults.conf | 0 .../vulkan => util}/00-panvk-defaults.conf | 0 .../r300 => util}/00-r300-defaults.conf | 0 .../r600 => util}/00-r600-defaults.conf | 0 .../00-radeonsi-defaults.conf | 0 .../vulkan => util}/00-radv-defaults.conf | 0 .../vulkan => util}/00-turnip-defaults.conf | 0 .../drivers/v3d => util}/00-v3d-defaults.conf | 0 .../00-virtio_gpu-defaults.conf | 0 .../svga => util}/00-vmwgfx-defaults.conf | 0 .../zink => util}/00-zink-defaults.conf | 0 src/util/meson.build | 42 +++++++++---------- 24 files changed, 24 insertions(+), 24 deletions(-) rename src/{intel/vulkan => util}/00-anv-defaults.conf (100%) rename src/{gallium/drivers/asahi => util}/00-asahi-defaults.conf (100%) rename src/{gallium/drivers/crocus => util}/00-crocus-defaults.conf (100%) rename src/{gallium/drivers/d3d12 => util}/00-d3d12-defaults.conf (100%) rename src/{microsoft/vulkan => util}/00-dzn-defaults.conf (100%) rename src/{intel/vulkan_hasvk => util}/00-hasvk-defaults.conf (100%) rename src/{asahi/vulkan => util}/00-hk-defaults.conf (100%) rename src/{gallium/drivers/iris => util}/00-iris-defaults.conf (100%) rename src/{gallium/drivers/freedreno => util}/00-msm-defaults.conf (100%) rename src/{nouveau/vulkan => util}/00-nvk-defaults.conf (100%) rename src/{gallium/drivers/panfrost => util}/00-panfrost-defaults.conf (100%) rename src/{panfrost/vulkan => util}/00-panvk-defaults.conf (100%) rename src/{gallium/drivers/r300 => util}/00-r300-defaults.conf (100%) rename src/{gallium/drivers/r600 => util}/00-r600-defaults.conf (100%) rename src/{gallium/drivers/radeonsi => util}/00-radeonsi-defaults.conf (100%) rename src/{amd/vulkan => util}/00-radv-defaults.conf (100%) rename src/{freedreno/vulkan => util}/00-turnip-defaults.conf (100%) rename src/{gallium/drivers/v3d => util}/00-v3d-defaults.conf (100%) rename src/{gallium/drivers/virgl => util}/00-virtio_gpu-defaults.conf (100%) rename src/{gallium/drivers/svga => util}/00-vmwgfx-defaults.conf (100%) rename src/{gallium/drivers/zink => util}/00-zink-defaults.conf (100%) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 304d06caa65..0f3005aaa8e 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -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'), ), ) diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 461c908379e..b3b9e22c2bf 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -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/'), diff --git a/src/intel/vulkan/00-anv-defaults.conf b/src/util/00-anv-defaults.conf similarity index 100% rename from src/intel/vulkan/00-anv-defaults.conf rename to src/util/00-anv-defaults.conf diff --git a/src/gallium/drivers/asahi/00-asahi-defaults.conf b/src/util/00-asahi-defaults.conf similarity index 100% rename from src/gallium/drivers/asahi/00-asahi-defaults.conf rename to src/util/00-asahi-defaults.conf diff --git a/src/gallium/drivers/crocus/00-crocus-defaults.conf b/src/util/00-crocus-defaults.conf similarity index 100% rename from src/gallium/drivers/crocus/00-crocus-defaults.conf rename to src/util/00-crocus-defaults.conf diff --git a/src/gallium/drivers/d3d12/00-d3d12-defaults.conf b/src/util/00-d3d12-defaults.conf similarity index 100% rename from src/gallium/drivers/d3d12/00-d3d12-defaults.conf rename to src/util/00-d3d12-defaults.conf diff --git a/src/microsoft/vulkan/00-dzn-defaults.conf b/src/util/00-dzn-defaults.conf similarity index 100% rename from src/microsoft/vulkan/00-dzn-defaults.conf rename to src/util/00-dzn-defaults.conf diff --git a/src/intel/vulkan_hasvk/00-hasvk-defaults.conf b/src/util/00-hasvk-defaults.conf similarity index 100% rename from src/intel/vulkan_hasvk/00-hasvk-defaults.conf rename to src/util/00-hasvk-defaults.conf diff --git a/src/asahi/vulkan/00-hk-defaults.conf b/src/util/00-hk-defaults.conf similarity index 100% rename from src/asahi/vulkan/00-hk-defaults.conf rename to src/util/00-hk-defaults.conf diff --git a/src/gallium/drivers/iris/00-iris-defaults.conf b/src/util/00-iris-defaults.conf similarity index 100% rename from src/gallium/drivers/iris/00-iris-defaults.conf rename to src/util/00-iris-defaults.conf diff --git a/src/gallium/drivers/freedreno/00-msm-defaults.conf b/src/util/00-msm-defaults.conf similarity index 100% rename from src/gallium/drivers/freedreno/00-msm-defaults.conf rename to src/util/00-msm-defaults.conf diff --git a/src/nouveau/vulkan/00-nvk-defaults.conf b/src/util/00-nvk-defaults.conf similarity index 100% rename from src/nouveau/vulkan/00-nvk-defaults.conf rename to src/util/00-nvk-defaults.conf diff --git a/src/gallium/drivers/panfrost/00-panfrost-defaults.conf b/src/util/00-panfrost-defaults.conf similarity index 100% rename from src/gallium/drivers/panfrost/00-panfrost-defaults.conf rename to src/util/00-panfrost-defaults.conf diff --git a/src/panfrost/vulkan/00-panvk-defaults.conf b/src/util/00-panvk-defaults.conf similarity index 100% rename from src/panfrost/vulkan/00-panvk-defaults.conf rename to src/util/00-panvk-defaults.conf diff --git a/src/gallium/drivers/r300/00-r300-defaults.conf b/src/util/00-r300-defaults.conf similarity index 100% rename from src/gallium/drivers/r300/00-r300-defaults.conf rename to src/util/00-r300-defaults.conf diff --git a/src/gallium/drivers/r600/00-r600-defaults.conf b/src/util/00-r600-defaults.conf similarity index 100% rename from src/gallium/drivers/r600/00-r600-defaults.conf rename to src/util/00-r600-defaults.conf diff --git a/src/gallium/drivers/radeonsi/00-radeonsi-defaults.conf b/src/util/00-radeonsi-defaults.conf similarity index 100% rename from src/gallium/drivers/radeonsi/00-radeonsi-defaults.conf rename to src/util/00-radeonsi-defaults.conf 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/freedreno/vulkan/00-turnip-defaults.conf b/src/util/00-turnip-defaults.conf similarity index 100% rename from src/freedreno/vulkan/00-turnip-defaults.conf rename to src/util/00-turnip-defaults.conf diff --git a/src/gallium/drivers/v3d/00-v3d-defaults.conf b/src/util/00-v3d-defaults.conf similarity index 100% rename from src/gallium/drivers/v3d/00-v3d-defaults.conf rename to src/util/00-v3d-defaults.conf diff --git a/src/gallium/drivers/virgl/00-virtio_gpu-defaults.conf b/src/util/00-virtio_gpu-defaults.conf similarity index 100% rename from src/gallium/drivers/virgl/00-virtio_gpu-defaults.conf rename to src/util/00-virtio_gpu-defaults.conf diff --git a/src/gallium/drivers/svga/00-vmwgfx-defaults.conf b/src/util/00-vmwgfx-defaults.conf similarity index 100% rename from src/gallium/drivers/svga/00-vmwgfx-defaults.conf rename to src/util/00-vmwgfx-defaults.conf diff --git a/src/gallium/drivers/zink/00-zink-defaults.conf b/src/util/00-zink-defaults.conf similarity index 100% rename from src/gallium/drivers/zink/00-zink-defaults.conf rename to src/util/00-zink-defaults.conf diff --git a/src/util/meson.build b/src/util/meson.build index c025d069e3d..6ff02a2f44a 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -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])