From 3c48fd8a6da1863af1dbd4f4f87997b622be4074 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 22 Mar 2024 10:53:04 -0400 Subject: [PATCH] gallium: Rename ${target}/target.c to ${target}/{$target}_target.c This is one of the few places in Mesa where filenames collide this much and it's Super Annoying. Acked-by: Daniel Stone Part-of: --- src/gallium/targets/dri/{target.c => dri_target.c} | 0 src/gallium/targets/dri/meson.build | 2 +- src/gallium/targets/lavapipe/{target.c => lavapipe_target.c} | 0 src/gallium/targets/lavapipe/meson.build | 2 +- src/gallium/targets/omx/meson.build | 2 +- src/gallium/targets/omx/{target.c => omx_target.c} | 0 src/gallium/targets/osmesa/meson.build | 2 +- src/gallium/targets/osmesa/{target.c => osmesa_target.c} | 0 src/gallium/targets/rusticl/meson.build | 2 +- src/gallium/targets/rusticl/{target.c => rusticl_target.c} | 0 src/gallium/targets/teflon/meson.build | 2 +- src/gallium/targets/teflon/{target.c => teflon_target.c} | 0 src/gallium/targets/va/meson.build | 4 ++-- src/gallium/targets/va/{target.c => va_target.c} | 0 src/gallium/targets/vdpau/meson.build | 2 +- src/gallium/targets/vdpau/{target.c => vdpau_target.c} | 0 src/gallium/targets/xa/meson.build | 2 +- src/gallium/targets/xa/{target.c => xa_target.c} | 0 18 files changed, 10 insertions(+), 10 deletions(-) rename src/gallium/targets/dri/{target.c => dri_target.c} (100%) rename src/gallium/targets/lavapipe/{target.c => lavapipe_target.c} (100%) rename src/gallium/targets/omx/{target.c => omx_target.c} (100%) rename src/gallium/targets/osmesa/{target.c => osmesa_target.c} (100%) rename src/gallium/targets/rusticl/{target.c => rusticl_target.c} (100%) rename src/gallium/targets/teflon/{target.c => teflon_target.c} (100%) rename src/gallium/targets/va/{target.c => va_target.c} (100%) rename src/gallium/targets/vdpau/{target.c => vdpau_target.c} (100%) rename src/gallium/targets/xa/{target.c => xa_target.c} (100%) diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/dri_target.c similarity index 100% rename from src/gallium/targets/dri/target.c rename to src/gallium/targets/dri/dri_target.c diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 04cb84eabf6..2a9a9af0d50 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -24,7 +24,7 @@ endif libgallium_dri = shared_library( 'gallium_dri', - files('target.c'), + files('dri_target.c'), include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, inc_gallium_winsys, include_directories('../../frontends/dri'), diff --git a/src/gallium/targets/lavapipe/target.c b/src/gallium/targets/lavapipe/lavapipe_target.c similarity index 100% rename from src/gallium/targets/lavapipe/target.c rename to src/gallium/targets/lavapipe/lavapipe_target.c diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build index b734076cc59..19bf33a55a7 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -2,7 +2,7 @@ libvulkan_lvp = shared_library( 'vulkan_lvp', - [ 'target.c' ], + [ 'lavapipe_target.c' ], vs_module_defs : vulkan_api_def, include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ], link_whole : [ liblavapipe_st ], diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build index 696db51bf54..5bfa7fdcf92 100644 --- a/src/gallium/targets/omx/meson.build +++ b/src/gallium/targets/omx/meson.build @@ -17,7 +17,7 @@ endif libomx_gallium = shared_library( 'omx_mesa', - 'target.c', + 'omx_target.c', gnu_symbol_visibility : 'hidden', link_args : [omx_link_args, ld_args_gc_sections], include_directories : [ diff --git a/src/gallium/targets/omx/target.c b/src/gallium/targets/omx/omx_target.c similarity index 100% rename from src/gallium/targets/omx/target.c rename to src/gallium/targets/omx/omx_target.c diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index 58696af4714..086d64131d0 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -24,7 +24,7 @@ osmesa_def = custom_target( libosmesa = shared_library( osmesa_lib_name, - 'target.c', + 'osmesa_target.c', gnu_symbol_visibility : 'hidden', link_args : [ld_args_gc_sections, osmesa_link_args], vs_module_defs : osmesa_def, diff --git a/src/gallium/targets/osmesa/target.c b/src/gallium/targets/osmesa/osmesa_target.c similarity index 100% rename from src/gallium/targets/osmesa/target.c rename to src/gallium/targets/osmesa/osmesa_target.c diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build index 8853625f0aa..79a46902119 100644 --- a/src/gallium/targets/rusticl/meson.build +++ b/src/gallium/targets/rusticl/meson.build @@ -13,7 +13,7 @@ endif librusticl = shared_library( 'RusticlOpenCL', - 'target.c', + 'rusticl_target.c', gnu_symbol_visibility : 'hidden', include_directories : [ inc_include, diff --git a/src/gallium/targets/rusticl/target.c b/src/gallium/targets/rusticl/rusticl_target.c similarity index 100% rename from src/gallium/targets/rusticl/target.c rename to src/gallium/targets/rusticl/rusticl_target.c diff --git a/src/gallium/targets/teflon/meson.build b/src/gallium/targets/teflon/meson.build index be05252d2b5..100e423ed29 100644 --- a/src/gallium/targets/teflon/meson.build +++ b/src/gallium/targets/teflon/meson.build @@ -1,6 +1,6 @@ libteflon = shared_library( 'teflon', - [ 'target.c' ], + [ 'teflon_target.c' ], include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ], link_whole : [ libteflon_st ], link_with : [libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, libgallium ], diff --git a/src/gallium/targets/teflon/target.c b/src/gallium/targets/teflon/teflon_target.c similarity index 100% rename from src/gallium/targets/teflon/target.c rename to src/gallium/targets/teflon/teflon_target.c diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 462f6c7610e..ce41009766e 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -52,7 +52,7 @@ if host_machine.system() == 'windows' libva_gallium = shared_library( 'vaon12_drv_video', - 'target.c', + 'va_target.c', link_args : [va_link_args, ld_args_gc_sections, ld_args_build_id], vs_module_defs : vaon12_def, include_directories : [ @@ -69,7 +69,7 @@ if host_machine.system() == 'windows' else libva_gallium = shared_library( 'gallium_drv_video', - 'target.c', + 'va_target.c', gnu_symbol_visibility : 'hidden', link_args : [va_link_args, ld_args_gc_sections, ld_args_build_id], include_directories : [ diff --git a/src/gallium/targets/va/target.c b/src/gallium/targets/va/va_target.c similarity index 100% rename from src/gallium/targets/va/target.c rename to src/gallium/targets/va/va_target.c diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index d30c8604ee4..ab40f09b4de 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -31,7 +31,7 @@ endif libvdpau_gallium = shared_library( 'vdpau_gallium', - 'target.c', + 'vdpau_target.c', gnu_symbol_visibility : 'hidden', link_args : [vdpau_link_args, ld_args_gc_sections], include_directories : [ diff --git a/src/gallium/targets/vdpau/target.c b/src/gallium/targets/vdpau/vdpau_target.c similarity index 100% rename from src/gallium/targets/vdpau/target.c rename to src/gallium/targets/vdpau/vdpau_target.c diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build index 0be7b6efe97..ceb8edbc8e0 100644 --- a/src/gallium/targets/xa/meson.build +++ b/src/gallium/targets/xa/meson.build @@ -17,7 +17,7 @@ _xa_version = '.'.join(xa_version) libxatracker = shared_library( 'xatracker', - 'target.c', + 'xa_target.c', gnu_symbol_visibility : 'hidden', link_args : [xa_link_args, ld_args_gc_sections], include_directories : [ diff --git a/src/gallium/targets/xa/target.c b/src/gallium/targets/xa/xa_target.c similarity index 100% rename from src/gallium/targets/xa/target.c rename to src/gallium/targets/xa/xa_target.c