From 42ed6d9789f014b6ee18129a568b397e53c1e044 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Wed, 13 Mar 2019 00:38:02 +0100 Subject: [PATCH] turnip: Deconflict vk_format_table regeneration Avoids src/freedreno/vulkan/meson.build:42:0: ERROR: Tried to create target "vk_format_table.c", but a target of that name already exists. when building both radv and turnip. Fixes: 26380b3a9f8 "turnip: Add driver skeleton (v2)" Reviewed-by: Eric Engestrom Reviewed-by: Kristian H. Kristensen --- src/amd/vulkan/meson.build | 6 +++--- src/freedreno/vulkan/meson.build | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 06c33ca45dc..385b5ada0b9 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -39,8 +39,8 @@ radv_extensions_c = custom_target( ], ) -vk_format_table_c = custom_target( - 'vk_format_table.c', +amd_vk_format_table_c = custom_target( + 'amd_vk_format_table.c', input : ['vk_format_table.py', 'vk_format_layout.csv'], output : 'vk_format_table.c', command : [prog_python, '@INPUT@'], @@ -130,7 +130,7 @@ endif libvulkan_radeon = shared_library( 'vulkan_radeon', - [libradv_files, radv_entrypoints, radv_extensions_c, vk_format_table_c, sha1_h], + [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h], include_directories : [ inc_common, inc_amd, inc_amd_common, inc_compiler, inc_vulkan_util, inc_vulkan_wsi, diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index 40a0105e9ae..f58aff2cbdb 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -39,8 +39,8 @@ tu_extensions_c = custom_target( ], ) -vk_format_table_c = custom_target( - 'vk_format_table.c', +tu_format_table_c = custom_target( + 'tu_format_table.c', input : ['vk_format_table.py', 'vk_format_layout.csv'], output : 'vk_format_table.c', command : [prog_python, '@INPUT@'], @@ -86,7 +86,7 @@ endif libvulkan_freedreno = shared_library( 'vulkan_freedreno', - [libtu_files, tu_entrypoints, tu_extensions_c, vk_format_table_c], + [libtu_files, tu_entrypoints, tu_extensions_c, tu_format_table_c], include_directories : [ inc_common, inc_compiler, -- 2.30.2