From 97391328a38b3edb8df3cc9507e34808b8111457 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 28 May 2026 17:06:31 +0200 Subject: [PATCH] drirc: move 00-$drv-defaults.conf to each driver's folder Makes more send to put them there, and it means that modifying them will only trigger the CI jobs for that driver and not everything. Part-of: --- .../vulkan}/00-radv-defaults.conf | 0 src/amd/vulkan/meson.build | 4 +- .../vulkan}/00-hk-defaults.conf | 0 .../vulkan}/00-turnip-defaults.conf | 0 .../drivers/asahi}/00-asahi-defaults.conf | 0 .../drivers/crocus}/00-crocus-defaults.conf | 0 .../drivers/d3d12}/00-d3d12-defaults.conf | 0 .../drivers/freedreno}/00-msm-defaults.conf | 0 .../drivers/iris}/00-iris-defaults.conf | 0 .../panfrost}/00-panfrost-defaults.conf | 0 .../drivers/r300}/00-r300-defaults.conf | 0 .../drivers/r600}/00-r600-defaults.conf | 0 .../radeonsi}/00-radeonsi-defaults.conf | 0 .../drivers/svga}/00-vmwgfx-defaults.conf | 0 .../drivers/v3d}/00-v3d-defaults.conf | 0 .../virgl}/00-virtio_gpu-defaults.conf | 0 .../drivers/zink}/00-zink-defaults.conf | 0 .../vulkan}/00-anv-defaults.conf | 0 .../vulkan_hasvk}/00-hasvk-defaults.conf | 0 .../vulkan}/00-dzn-defaults.conf | 0 .../vulkan}/00-nvk-defaults.conf | 0 .../vulkan}/00-panvk-defaults.conf | 0 src/util/meson.build | 42 +++++++++---------- 23 files changed, 23 insertions(+), 23 deletions(-) rename src/{util => amd/vulkan}/00-radv-defaults.conf (100%) rename src/{util => asahi/vulkan}/00-hk-defaults.conf (100%) rename src/{util => freedreno/vulkan}/00-turnip-defaults.conf (100%) rename src/{util => gallium/drivers/asahi}/00-asahi-defaults.conf (100%) rename src/{util => gallium/drivers/crocus}/00-crocus-defaults.conf (100%) rename src/{util => gallium/drivers/d3d12}/00-d3d12-defaults.conf (100%) rename src/{util => gallium/drivers/freedreno}/00-msm-defaults.conf (100%) rename src/{util => gallium/drivers/iris}/00-iris-defaults.conf (100%) rename src/{util => gallium/drivers/panfrost}/00-panfrost-defaults.conf (100%) rename src/{util => gallium/drivers/r300}/00-r300-defaults.conf (100%) rename src/{util => gallium/drivers/r600}/00-r600-defaults.conf (100%) rename src/{util => gallium/drivers/radeonsi}/00-radeonsi-defaults.conf (100%) rename src/{util => gallium/drivers/svga}/00-vmwgfx-defaults.conf (100%) rename src/{util => gallium/drivers/v3d}/00-v3d-defaults.conf (100%) rename src/{util => gallium/drivers/virgl}/00-virtio_gpu-defaults.conf (100%) rename src/{util => gallium/drivers/zink}/00-zink-defaults.conf (100%) rename src/{util => intel/vulkan}/00-anv-defaults.conf (100%) rename src/{util => intel/vulkan_hasvk}/00-hasvk-defaults.conf (100%) rename src/{util => microsoft/vulkan}/00-dzn-defaults.conf (100%) rename src/{util => nouveau/vulkan}/00-nvk-defaults.conf (100%) rename src/{util => panfrost/vulkan}/00-panvk-defaults.conf (100%) diff --git a/src/util/00-radv-defaults.conf b/src/amd/vulkan/00-radv-defaults.conf similarity index 100% rename from src/util/00-radv-defaults.conf rename to src/amd/vulkan/00-radv-defaults.conf diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 4d0da31a263..7a4b6956b6a 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/util/00-radv-defaults.conf'), + '--validate', join_paths(dir_source_root, 'src/amd/vulkan/00-radv-defaults.conf'), ], depend_files : files( join_paths(dir_source_root, 'src/util/drirc_gen.py'), - join_paths(dir_source_root, 'src/util/00-radv-defaults.conf'), + '00-radv-defaults.conf', ), ) diff --git a/src/util/00-hk-defaults.conf b/src/asahi/vulkan/00-hk-defaults.conf similarity index 100% rename from src/util/00-hk-defaults.conf rename to src/asahi/vulkan/00-hk-defaults.conf diff --git a/src/util/00-turnip-defaults.conf b/src/freedreno/vulkan/00-turnip-defaults.conf similarity index 100% rename from src/util/00-turnip-defaults.conf rename to src/freedreno/vulkan/00-turnip-defaults.conf diff --git a/src/util/00-asahi-defaults.conf b/src/gallium/drivers/asahi/00-asahi-defaults.conf similarity index 100% rename from src/util/00-asahi-defaults.conf rename to src/gallium/drivers/asahi/00-asahi-defaults.conf diff --git a/src/util/00-crocus-defaults.conf b/src/gallium/drivers/crocus/00-crocus-defaults.conf similarity index 100% rename from src/util/00-crocus-defaults.conf rename to src/gallium/drivers/crocus/00-crocus-defaults.conf diff --git a/src/util/00-d3d12-defaults.conf b/src/gallium/drivers/d3d12/00-d3d12-defaults.conf similarity index 100% rename from src/util/00-d3d12-defaults.conf rename to src/gallium/drivers/d3d12/00-d3d12-defaults.conf diff --git a/src/util/00-msm-defaults.conf b/src/gallium/drivers/freedreno/00-msm-defaults.conf similarity index 100% rename from src/util/00-msm-defaults.conf rename to src/gallium/drivers/freedreno/00-msm-defaults.conf diff --git a/src/util/00-iris-defaults.conf b/src/gallium/drivers/iris/00-iris-defaults.conf similarity index 100% rename from src/util/00-iris-defaults.conf rename to src/gallium/drivers/iris/00-iris-defaults.conf diff --git a/src/util/00-panfrost-defaults.conf b/src/gallium/drivers/panfrost/00-panfrost-defaults.conf similarity index 100% rename from src/util/00-panfrost-defaults.conf rename to src/gallium/drivers/panfrost/00-panfrost-defaults.conf diff --git a/src/util/00-r300-defaults.conf b/src/gallium/drivers/r300/00-r300-defaults.conf similarity index 100% rename from src/util/00-r300-defaults.conf rename to src/gallium/drivers/r300/00-r300-defaults.conf diff --git a/src/util/00-r600-defaults.conf b/src/gallium/drivers/r600/00-r600-defaults.conf similarity index 100% rename from src/util/00-r600-defaults.conf rename to src/gallium/drivers/r600/00-r600-defaults.conf diff --git a/src/util/00-radeonsi-defaults.conf b/src/gallium/drivers/radeonsi/00-radeonsi-defaults.conf similarity index 100% rename from src/util/00-radeonsi-defaults.conf rename to src/gallium/drivers/radeonsi/00-radeonsi-defaults.conf diff --git a/src/util/00-vmwgfx-defaults.conf b/src/gallium/drivers/svga/00-vmwgfx-defaults.conf similarity index 100% rename from src/util/00-vmwgfx-defaults.conf rename to src/gallium/drivers/svga/00-vmwgfx-defaults.conf diff --git a/src/util/00-v3d-defaults.conf b/src/gallium/drivers/v3d/00-v3d-defaults.conf similarity index 100% rename from src/util/00-v3d-defaults.conf rename to src/gallium/drivers/v3d/00-v3d-defaults.conf diff --git a/src/util/00-virtio_gpu-defaults.conf b/src/gallium/drivers/virgl/00-virtio_gpu-defaults.conf similarity index 100% rename from src/util/00-virtio_gpu-defaults.conf rename to src/gallium/drivers/virgl/00-virtio_gpu-defaults.conf diff --git a/src/util/00-zink-defaults.conf b/src/gallium/drivers/zink/00-zink-defaults.conf similarity index 100% rename from src/util/00-zink-defaults.conf rename to src/gallium/drivers/zink/00-zink-defaults.conf diff --git a/src/util/00-anv-defaults.conf b/src/intel/vulkan/00-anv-defaults.conf similarity index 100% rename from src/util/00-anv-defaults.conf rename to src/intel/vulkan/00-anv-defaults.conf diff --git a/src/util/00-hasvk-defaults.conf b/src/intel/vulkan_hasvk/00-hasvk-defaults.conf similarity index 100% rename from src/util/00-hasvk-defaults.conf rename to src/intel/vulkan_hasvk/00-hasvk-defaults.conf diff --git a/src/util/00-dzn-defaults.conf b/src/microsoft/vulkan/00-dzn-defaults.conf similarity index 100% rename from src/util/00-dzn-defaults.conf rename to src/microsoft/vulkan/00-dzn-defaults.conf diff --git a/src/util/00-nvk-defaults.conf b/src/nouveau/vulkan/00-nvk-defaults.conf similarity index 100% rename from src/util/00-nvk-defaults.conf rename to src/nouveau/vulkan/00-nvk-defaults.conf diff --git a/src/util/00-panvk-defaults.conf b/src/panfrost/vulkan/00-panvk-defaults.conf similarity index 100% rename from src/util/00-panvk-defaults.conf rename to src/panfrost/vulkan/00-panvk-defaults.conf diff --git a/src/util/meson.build b/src/util/meson.build index 6ff02a2f44a..c025d069e3d 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, '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'], + [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'], ] if i[0] files_drirc += files(i[1])