fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-18 06:00:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

glapi: fix build dependencies by putting all xml/py files into a single list

Browse source 
This fixes missing script dependencies that didn't trigger rebuilds when
those files were changed. To keep it simple stupid, all xml and python
files used by python scripts indirectly are now in a single global list.

All variables holding file names are also inlined, so that we use file
paths everywhere.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33634>
This commit is contained in:
Marek Olšák 2025-01-25 13:20:04 -05:00 • committed by Marge Bot
parent 11364cd133
commit 3fc52ac0e0
8 changed files with 180 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/egl/meson.build
View file

@ -59,7 +59,7 @@ g_egldispatchstubs_c = custom_target(
command : [
prog_python, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@',
],
depend_files : [ files('generate/eglFunctionList.py'), genCommon_py, ],
depend_files : [ 'generate/eglFunctionList.py', glapi_xml_py_deps],
capture : true,
)
@ -73,7 +73,7 @@ g_egldispatchstubs_h = custom_target(
command : [
prog_python, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@',
],
depend_files : [ files('generate/eglFunctionList.py'), genCommon_py, ],
depend_files : [ 'generate/eglFunctionList.py', glapi_xml_py_deps],
capture : true,
)

4
src/mapi/es1api/meson.build
View file

@ -3,10 +3,10 @@
es1_glapi_mapi_tmp_h = custom_target(
'es1_glapi_mapi_tmp.h',
input : [glapi_gen_mapi_py, glapi_gen_gl_xml],
input : ['../new/gen_gldispatch_mapi.py', '../glapi/registry/gl.xml'],
output : 'glapi_mapi_tmp.h',
command : [prog_python, '@INPUT0@', 'glesv1', '@INPUT1@'],
depend_files : glapi_gen_mapi_deps,
depend_files : glapi_xml_py_deps,
capture : true,
)

4
src/mapi/es2api/meson.build
View file

@ -3,10 +3,10 @@
es2_glapi_mapi_tmp_h = custom_target(
'es2_glapi_mapi_tmp.h',
input : [glapi_gen_mapi_py, glapi_gen_gl_xml],
input : ['../new/gen_gldispatch_mapi.py', '../glapi/registry/gl.xml'],
output : 'glapi_mapi_tmp.h',
command : [prog_python, '@INPUT0@', 'glesv2', '@INPUT1@'],
depend_files : glapi_gen_mapi_deps,
depend_files : glapi_xml_py_deps,
capture : true,
)

193
src/mapi/glapi/gen/meson.build
View file

@ -1,161 +1,12 @@
# Copyright © 2017 Intel Corporation
# SPDX-License-Identifier: MIT
glapi_gen_gl_xml = files('../registry/gl.xml')
glapi_gen_mapi_deps = [
glapi_gen_gl_xml,
genCommon_py,
]
gl_and_es_api_files = files('gl_and_es_API.xml')
api_xml_files = files(
'gl_API.xml',
'es_EXT.xml',
'gl_and_es_API.xml',
'gl_and_glX_API.xml',
'ARB_base_instance.xml',
'ARB_blend_func_extended.xml',
'ARB_bindless_texture.xml',
'ARB_clear_buffer_object.xml',
'ARB_clear_texture.xml',
'ARB_clip_control.xml',
'ARB_color_buffer_float.xml',
'ARB_compressed_texture_pixel_storage.xml',
'ARB_compute_shader.xml',
'ARB_compute_variable_group_size.xml',
'ARB_copy_buffer.xml',
'ARB_copy_image.xml',
'ARB_debug_output.xml',
'ARB_depth_buffer_float.xml',
'ARB_depth_clamp.xml',
'ARB_direct_state_access.xml',
'ARB_draw_buffers.xml',
'ARB_draw_buffers_blend.xml',
'ARB_draw_elements_base_vertex.xml',
'ARB_draw_indirect.xml',
'ARB_draw_instanced.xml',
'ARB_ES2_compatibility.xml',
'ARB_ES3_compatibility.xml',
'ARB_framebuffer_no_attachments.xml',
'ARB_framebuffer_object.xml',
'ARB_get_program_binary.xml',
'ARB_get_texture_sub_image.xml',
'ARB_gl_spirv.xml',
'ARB_gpu_shader_fp64.xml',
'ARB_gpu_shader_int64.xml',
'ARB_gpu_shader5.xml',
'ARB_indirect_parameters.xml',
'ARB_instanced_arrays.xml',
'ARB_internalformat_query.xml',
'ARB_internalformat_query2.xml',
'ARB_invalidate_subdata.xml',
'ARB_map_buffer_range.xml',
'ARB_multi_bind.xml',
'ARB_pipeline_statistics_query.xml',
'ARB_program_interface_query.xml',
'ARB_robustness.xml',
'ARB_sample_shading.xml',
'ARB_sampler_objects.xml',
'ARB_seamless_cube_map.xml',
'ARB_separate_shader_objects.xml',
'ARB_shader_atomic_counters.xml',
'ARB_shader_image_load_store.xml',
'ARB_shader_subroutine.xml',
'ARB_shader_storage_buffer_object.xml',
'ARB_sparse_buffer.xml',
'ARB_sparse_texture.xml',
'ARB_spirv_extensions.xml',
'ARB_sync.xml',
'ARB_tessellation_shader.xml',
'ARB_texture_barrier.xml',
'ARB_texture_buffer_object.xml',
'ARB_texture_buffer_range.xml',
'ARB_texture_compression_rgtc.xml',
'ARB_texture_cube_map_array.xml',
'ARB_texture_float.xml',
'ARB_texture_gather.xml',
'ARB_texture_multisample.xml',
'ARB_texture_rgb10_a2ui.xml',
'ARB_texture_rg.xml',
'ARB_texture_storage_multisample.xml',
'ARB_texture_storage.xml',
'ARB_texture_view.xml',
'ARB_uniform_buffer_object.xml',
'ARB_vertex_array_object.xml',
'ARB_vertex_attrib_64bit.xml',
'ARB_vertex_attrib_binding.xml',
'ARB_viewport_array.xml',
'AMD_depth_clamp_separate.xml',
'AMD_draw_buffers_blend.xml',
'AMD_gpu_shader_int64.xml',
'AMD_performance_monitor.xml',
'ARB_vertex_type_2_10_10_10_rev.xml',
'APPLE_object_purgeable.xml',
'APPLE_vertex_array_object.xml',
'EXT_direct_state_access.xml',
'EXT_draw_buffers2.xml',
'EXT_external_objects.xml',
'EXT_external_objects_fd.xml',
'EXT_external_objects_win32.xml',
'EXT_framebuffer_object.xml',
'EXT_gpu_shader4.xml',
'EXT_multisampled_render_to_texture.xml',
'EXT_packed_depth_stencil.xml',
'EXT_provoking_vertex.xml',
'EXT_separate_shader_objects.xml',
'EXT_shader_image_load_store.xml',
'EXT_texture_array.xml',
'EXT_texture_integer.xml',
'EXT_texture_storage.xml',
'EXT_texture_storage_compression.xml',
'EXT_transform_feedback.xml',
'EXT_vertex_attrib_64bit.xml',
'EXT_window_rectangles.xml',
'GREMEDY_string_marker.xml',
'INTEL_performance_query.xml',
'KHR_debug.xml',
'KHR_context_flush_control.xml',
'KHR_robustness.xml',
'KHR_robustness_es.xml',
'KHR_shader_subgroup.xml',
'KHR_texture_compression_astc.xml',
'NV_alpha_to_coverage_dither_control.xml',
'NV_copy_image.xml',
'NV_conditional_render.xml',
'NV_primitive_restart.xml',
'NV_texture_barrier.xml',
'NV_vdpau_interop.xml',
'NV_viewport_swizzle.xml',
'OES_EGL_image.xml',
'OES_fixed_point.xml',
'OES_single_precision.xml',
'OES_texture_compression_astc.xml',
'OVR_multiview.xml',
'GL3x.xml',
'GL4x.xml',
)
glapi_gen_depends = files(
'gl_XML.py',
'glX_XML.py',
'license.py',
'static_data.py',
'typeexpr.py',
) + api_xml_files
glx_gen_depends = files(
'glX_API.xml',
'glX_XML.py',
'glX_proto_common.py',
) + api_xml_files
glapi_mapi_tmp_h = custom_target(
'glapi_mapi_tmp.h',
input : [mapi_abi_py, 'gl_and_es_API.xml'],
input : ['../../mapi_abi.py', 'gl_and_es_API.xml'],
output : 'glapi_mapi_tmp.h',
command : [prog_python, '@INPUT0@', '--printer', 'glapi', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -164,7 +15,7 @@ glprocs_h = custom_target(
input : ['gl_procs.py', 'gl_and_es_API.xml'],
output : 'glprocs.h',
command : [prog_python, '@INPUT0@', '-c', '-f', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -173,7 +24,7 @@ glapitemp_h = custom_target(
input : ['gl_apitemp.py', 'gl_and_es_API.xml'],
output : 'glapitemp.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -182,7 +33,7 @@ glapitable_h = custom_target(
input : ['gl_table.py', 'gl_and_es_API.xml'],
output : 'glapitable.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -191,7 +42,7 @@ glapi_gentable_c = custom_target(
input : ['gl_gentable.py', 'gl_and_es_API.xml'],
output : 'glapi_gentable.c',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -208,7 +59,7 @@ main_api_exec_c = custom_target(
input : ['api_exec_init.py', 'gl_and_es_API.xml'],
output : 'api_exec_init.c',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('apiexec.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -217,7 +68,7 @@ main_api_exec_decl_h = custom_target(
input : ['api_exec_decl_h.py', 'gl_and_es_API.xml'],
output : 'api_exec_decl.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('apiexec.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -226,7 +77,7 @@ main_api_save_init_h = custom_target(
input : ['api_save_init_h.py', 'gl_and_es_API.xml'],
output : 'api_save_init.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('apiexec.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -235,7 +86,7 @@ main_api_save_h = custom_target(
input : ['api_save_h.py', 'gl_and_es_API.xml'],
output : 'api_save.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('apiexec.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -244,7 +95,7 @@ main_api_beginend_init_h = custom_target(
input : ['api_beginend_init_h.py', 'gl_and_es_API.xml'],
output : 'api_beginend_init.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('apiexec.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -253,7 +104,7 @@ main_api_hw_select_init_h = custom_target(
input : ['api_hw_select_init_h.py', 'gl_API.xml'],
output : 'api_hw_select_init.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('apiexec.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -262,7 +113,7 @@ main_unmarshal_table_c = custom_target(
input : ['gl_unmarshal_table.py', 'gl_and_es_API.xml'],
output : 'unmarshal_table.c',
command : [prog_python, '@INPUT0@', '@INPUT1@', sizeof_pointer],
depend_files : files('marshal_XML.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
@ -273,7 +124,7 @@ foreach x : ['0', '1', '2', '3', '4', '5', '6', '7']
input : ['gl_marshal.py', 'gl_and_es_API.xml'],
output : 'marshal_generated' + x + '.c',
command : [prog_python, '@INPUT0@', '@INPUT1@', x, '8', sizeof_pointer],
depend_files : files('marshal_XML.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
endforeach
@ -286,7 +137,7 @@ foreach x : [['indirect.c', 'proto'], ['indirect.h', 'init_h'], ['indirect_init.
input : ['glX_proto_send.py', 'gl_API.xml'],
output : x[0],
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@', '-m', x[1]],
depend_files : glx_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
endforeach
@ -298,7 +149,7 @@ foreach x : [['indirect_size.h', ['-m', 'size_h', '--header-tag', '_INDIRECT_SIZ
input : ['glX_proto_size.py', 'gl_API.xml'],
output : x[0],
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@', '--only-set', x[1]],
depend_files : glx_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
endforeach
@ -306,27 +157,27 @@ glx_indirect_size_h = glx_generated[3]
glapi_x86_s = custom_target(
'glapi_x86.S',
input : ['gl_x86_asm.py', gl_and_es_api_files],
input : ['gl_x86_asm.py', 'gl_and_es_API.xml'],
output : 'glapi_x86.S',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
glapi_x86_64_s = custom_target(
'glapi_x86-64.S',
input : ['gl_x86-64_asm.py', gl_and_es_api_files],
input : ['gl_x86-64_asm.py', 'gl_and_es_API.xml'],
output : 'glapi_x86-64.S',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
glapi_sparc_s = custom_target(
'glapi_sparc.S',
input : ['gl_SPARC_asm.py', gl_and_es_api_files],
input : ['gl_SPARC_asm.py', 'gl_and_es_API.xml'],
output : 'glapi_sparc.S',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)

147
src/mapi/meson.build
View file

@ -1,9 +1,150 @@
# Copyright © 2017 Intel Corporation
# SPDX-License-Identifier: MIT
genCommon_py = files('new/genCommon.py')
glapi_gen_mapi_py = files('new/gen_gldispatch_mapi.py')
mapi_abi_py = files('mapi_abi.py')
glapi_xml_py_deps = files(
# This is the list of all xml and py files that python scripts use indirectly.
# The purpose of this list is to trigger rebuilds when these files are changed.
#
# XML files are first (python files are at the end)
'glapi/gen/gl_API.dtd',
'glapi/gen/es_EXT.xml',
'glapi/gen/gl_API.xml',
'glapi/gen/gl_and_es_API.xml',
'glapi/gen/gl_and_glX_API.xml',
'glapi/gen/glX_API.xml',
'glapi/gen/ARB_base_instance.xml',
'glapi/gen/ARB_blend_func_extended.xml',
'glapi/gen/ARB_bindless_texture.xml',
'glapi/gen/ARB_clear_buffer_object.xml',
'glapi/gen/ARB_clear_texture.xml',
'glapi/gen/ARB_clip_control.xml',
'glapi/gen/ARB_color_buffer_float.xml',
'glapi/gen/ARB_compressed_texture_pixel_storage.xml',
'glapi/gen/ARB_compute_shader.xml',
'glapi/gen/ARB_compute_variable_group_size.xml',
'glapi/gen/ARB_copy_buffer.xml',
'glapi/gen/ARB_copy_image.xml',
'glapi/gen/ARB_debug_output.xml',
'glapi/gen/ARB_depth_buffer_float.xml',
'glapi/gen/ARB_depth_clamp.xml',
'glapi/gen/ARB_direct_state_access.xml',
'glapi/gen/ARB_draw_buffers.xml',
'glapi/gen/ARB_draw_buffers_blend.xml',
'glapi/gen/ARB_draw_elements_base_vertex.xml',
'glapi/gen/ARB_draw_indirect.xml',
'glapi/gen/ARB_draw_instanced.xml',
'glapi/gen/ARB_ES2_compatibility.xml',
'glapi/gen/ARB_ES3_compatibility.xml',
'glapi/gen/ARB_framebuffer_no_attachments.xml',
'glapi/gen/ARB_framebuffer_object.xml',
'glapi/gen/ARB_get_program_binary.xml',
'glapi/gen/ARB_get_texture_sub_image.xml',
'glapi/gen/ARB_gl_spirv.xml',
'glapi/gen/ARB_gpu_shader_fp64.xml',
'glapi/gen/ARB_gpu_shader_int64.xml',
'glapi/gen/ARB_gpu_shader5.xml',
'glapi/gen/ARB_indirect_parameters.xml',
'glapi/gen/ARB_instanced_arrays.xml',
'glapi/gen/ARB_internalformat_query.xml',
'glapi/gen/ARB_internalformat_query2.xml',
'glapi/gen/ARB_invalidate_subdata.xml',
'glapi/gen/ARB_map_buffer_range.xml',
'glapi/gen/ARB_multi_bind.xml',
'glapi/gen/ARB_pipeline_statistics_query.xml',
'glapi/gen/ARB_program_interface_query.xml',
'glapi/gen/ARB_robustness.xml',
'glapi/gen/ARB_sample_shading.xml',
'glapi/gen/ARB_sampler_objects.xml',
'glapi/gen/ARB_seamless_cube_map.xml',
'glapi/gen/ARB_separate_shader_objects.xml',
'glapi/gen/ARB_shader_atomic_counters.xml',
'glapi/gen/ARB_shader_image_load_store.xml',
'glapi/gen/ARB_shader_subroutine.xml',
'glapi/gen/ARB_shader_storage_buffer_object.xml',
'glapi/gen/ARB_sparse_buffer.xml',
'glapi/gen/ARB_sparse_texture.xml',
'glapi/gen/ARB_spirv_extensions.xml',
'glapi/gen/ARB_sync.xml',
'glapi/gen/ARB_tessellation_shader.xml',
'glapi/gen/ARB_texture_barrier.xml',
'glapi/gen/ARB_texture_buffer_object.xml',
'glapi/gen/ARB_texture_buffer_range.xml',
'glapi/gen/ARB_texture_compression_rgtc.xml',
'glapi/gen/ARB_texture_cube_map_array.xml',
'glapi/gen/ARB_texture_float.xml',
'glapi/gen/ARB_texture_gather.xml',
'glapi/gen/ARB_texture_multisample.xml',
'glapi/gen/ARB_texture_rgb10_a2ui.xml',
'glapi/gen/ARB_texture_rg.xml',
'glapi/gen/ARB_texture_storage_multisample.xml',
'glapi/gen/ARB_texture_storage.xml',
'glapi/gen/ARB_texture_view.xml',
'glapi/gen/ARB_uniform_buffer_object.xml',
'glapi/gen/ARB_vertex_array_object.xml',
'glapi/gen/ARB_vertex_attrib_64bit.xml',
'glapi/gen/ARB_vertex_attrib_binding.xml',
'glapi/gen/ARB_viewport_array.xml',
'glapi/gen/AMD_depth_clamp_separate.xml',
'glapi/gen/AMD_draw_buffers_blend.xml',
'glapi/gen/AMD_gpu_shader_int64.xml',
'glapi/gen/AMD_performance_monitor.xml',
'glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml',
'glapi/gen/APPLE_object_purgeable.xml',
'glapi/gen/APPLE_vertex_array_object.xml',
'glapi/gen/EXT_direct_state_access.xml',
'glapi/gen/EXT_draw_buffers2.xml',
'glapi/gen/EXT_external_objects.xml',
'glapi/gen/EXT_external_objects_fd.xml',
'glapi/gen/EXT_external_objects_win32.xml',
'glapi/gen/EXT_framebuffer_object.xml',
'glapi/gen/EXT_gpu_shader4.xml',
'glapi/gen/EXT_multisampled_render_to_texture.xml',
'glapi/gen/EXT_packed_depth_stencil.xml',
'glapi/gen/EXT_provoking_vertex.xml',
'glapi/gen/EXT_separate_shader_objects.xml',
'glapi/gen/EXT_shader_image_load_store.xml',
'glapi/gen/EXT_texture_array.xml',
'glapi/gen/EXT_texture_integer.xml',
'glapi/gen/EXT_texture_storage.xml',
'glapi/gen/EXT_texture_storage_compression.xml',
'glapi/gen/EXT_transform_feedback.xml',
'glapi/gen/EXT_vertex_attrib_64bit.xml',
'glapi/gen/EXT_window_rectangles.xml',
'glapi/gen/GREMEDY_string_marker.xml',
'glapi/gen/INTEL_performance_query.xml',
'glapi/gen/KHR_debug.xml',
'glapi/gen/KHR_context_flush_control.xml',
'glapi/gen/KHR_robustness.xml',
'glapi/gen/KHR_robustness_es.xml',
'glapi/gen/KHR_shader_subgroup.xml',
'glapi/gen/KHR_texture_compression_astc.xml',
'glapi/gen/NV_alpha_to_coverage_dither_control.xml',
'glapi/gen/NV_copy_image.xml',
'glapi/gen/NV_conditional_render.xml',
'glapi/gen/NV_primitive_restart.xml',
'glapi/gen/NV_texture_barrier.xml',
'glapi/gen/NV_vdpau_interop.xml',
'glapi/gen/NV_viewport_swizzle.xml',
'glapi/gen/OES_EGL_image.xml',
'glapi/gen/OES_fixed_point.xml',
'glapi/gen/OES_single_precision.xml',
'glapi/gen/OES_texture_compression_astc.xml',
'glapi/gen/OVR_multiview.xml',
'glapi/gen/GL3x.xml',
'glapi/gen/GL4x.xml',
'glapi/registry/gl.xml',
# Python files
'glapi/gen/apiexec.py',
'glapi/gen/gl_XML.py',
'glapi/gen/glX_XML.py',
'glapi/gen/glX_proto_common.py',
'glapi/gen/license.py',
'glapi/gen/marshal_XML.py',
'glapi/gen/static_data.py',
'glapi/gen/typeexpr.py',
'new/genCommon.py',
)
subdir('glapi')
if with_shared_glapi

4
src/mapi/shared-glapi/meson.build
View file

@ -13,10 +13,10 @@ files_shared_glapi = files(
shared_glapi_mapi_tmp_h = custom_target(
'shared_glapi_mapi_tmp.h',
input : [mapi_abi_py, gl_and_es_api_files],
input : ['../mapi_abi.py', '../glapi/gen/gl_and_es_API.xml'],
output : 'glapi_mapi_tmp.h',
command : [prog_python, '@INPUT0@', '--printer', 'shared-glapi', '@INPUT1@'],
depend_files : api_xml_files,
depend_files : glapi_xml_py_deps,
capture : true,
)

8
src/mesa/main/meson.build
View file

@ -3,19 +3,19 @@
main_dispatch_h = custom_target(
'dispatch.h',
input : [files('../../mapi/glapi/gen/gl_table.py'), gl_and_es_api_files],
input : ['../../mapi/glapi/gen/gl_table.py', '../../mapi/glapi/gen/gl_and_es_API.xml'],
output : 'dispatch.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@', '-m', 'dispatch'],
depend_files : glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)
main_marshal_generated_h = custom_target(
'marshal_generated.h',
input : [files('../../mapi/glapi/gen/gl_marshal_h.py'), gl_and_es_api_files],
input : ['../../mapi/glapi/gen/gl_marshal_h.py', '../../mapi/glapi/gen/gl_and_es_API.xml'],
output : 'marshal_generated.h',
command : [prog_python, '@INPUT0@', '@INPUT1@', sizeof_pointer],
depend_files : files('../../mapi/glapi/gen/marshal_XML.py') + glapi_gen_depends,
depend_files : glapi_xml_py_deps,
capture : true,
)

4
src/mesa/meson.build
View file

@ -391,10 +391,10 @@ format_fallback_c = custom_target(
get_hash_h = custom_target(
'get_hash.h',
input : ['main/get_hash_generator.py', gl_and_es_api_files],
input : ['main/get_hash_generator.py', '../mapi/glapi/gen/gl_and_es_API.xml'],
output : 'get_hash.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('main/get_hash_params.py'),
depend_files : files('main/get_hash_params.py') + glapi_xml_py_deps,
capture : true,
)