From 0cebfb15b568c79bfc7c3298954dff7302407722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 3 Mar 2025 16:05:20 -0500 Subject: [PATCH] glapi: remove duplicated generated header glapitable.h mesa/main/dispatch.h is exactly the same. We generated the same header twice. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/glx/apple/meson.build | 2 +- src/mapi/glapi/gen/meson.build | 9 --------- src/mapi/glapi/meson.build | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/glx/apple/meson.build b/src/glx/apple/meson.build index 84a44559820..bed11c08d6c 100644 --- a/src/glx/apple/meson.build +++ b/src/glx/apple/meson.build @@ -36,7 +36,7 @@ endif libappleglx = static_library( 'glxapple', - [files_libappleglx, glapitable_h], + [files_libappleglx, main_dispatch_h], include_directories: [inc_mesa, inc_glx, inc_src, inc_include, inc_glapi, inc_gallium, inc_loader], dependencies: [dep_xext, dep_xplugin], gnu_symbol_visibility : 'hidden', diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 129e7c65ee1..74e9ed3f79b 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -10,15 +10,6 @@ glapi_mapi_tmp_h = custom_target( capture : true, ) -glapitable_h = custom_target( - 'glapitable.h', - input : ['gl_table.py', 'gl_and_es_API.xml'], - output : 'glapitable.h', - command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], - depend_files : glapi_xml_py_deps, - capture : true, -) - glapi_gentable_c = custom_target( 'glapi_gentable.c', input : ['gl_gentable.py', 'gl_and_es_API.xml'], diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index a006116ae41..37455f28de8 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -16,7 +16,7 @@ bridge_glapi_files = files( bridge_glapi_files += glapi_mapi_tmp_h if with_dri and ['apple', 'windows'].contains(with_dri_platform) - bridge_glapi_files += [glapi_gentable_c, glapitable_h] + bridge_glapi_files += [glapi_gentable_c, main_dispatch_h] endif bridge_glapi_args = [