From 8f2532453ce730e971f23a8ee4e2eca4a5e81e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 4 Aug 2025 15:31:33 -0400 Subject: [PATCH] mesa: move src/mapi to src/mesa/glapi Acked-by: Alyssa Rosenzweig Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 3 +-- src/egl/drivers/haiku/egl_haiku.cpp | 2 +- src/egl/drivers/wgl/egl_wgl.c | 2 +- src/egl/generate/gen_egl_dispatch.py | 2 +- src/egl/main/eglapi.c | 2 +- src/gallium/frontends/glx/xlib/glx_api.c | 2 +- src/gallium/frontends/glx/xlib/glx_getproc.c | 2 +- src/gallium/frontends/glx/xlib/glx_usefont.c | 2 +- src/gallium/frontends/wgl/stw_device.c | 2 +- src/gallium/frontends/wgl/stw_getprocaddress.c | 2 +- src/glx/drisw_glx.c | 2 +- src/glx/xfont.c | 2 +- src/{mapi => mesa/glapi}/entry_ppc64le_tls.h | 0 src/{mapi => mesa/glapi}/entry_x86-64_tls.h | 0 src/{mapi => mesa/glapi}/entry_x86_tls.h | 0 src/{mapi => mesa/glapi}/es1api/gles1-symbols.txt | 0 src/{mapi => mesa/glapi}/es1api/gles1.def.in | 0 src/{mapi => mesa/glapi}/es1api/libgles1_public.c | 2 +- src/{mapi => mesa/glapi}/es1api/meson.build | 2 +- src/{mapi => mesa/glapi}/es2api/gles2-symbols.txt | 0 src/{mapi => mesa/glapi}/es2api/gles2.def.in | 0 src/{mapi => mesa/glapi}/es2api/libgles2_public.c | 2 +- src/{mapi => mesa/glapi}/es2api/meson.build | 2 +- .../glapi}/glapi/gen/AMD_depth_clamp_separate.xml | 0 .../glapi}/glapi/gen/AMD_draw_buffers_blend.xml | 0 .../glapi}/glapi/gen/AMD_gpu_shader_int64.xml | 0 .../glapi}/glapi/gen/AMD_performance_monitor.xml | 0 .../glapi}/glapi/gen/ARB_ES2_compatibility.xml | 0 .../glapi}/glapi/gen/ARB_ES3_compatibility.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_base_instance.xml | 0 .../glapi}/glapi/gen/ARB_bindless_texture.xml | 0 .../glapi}/glapi/gen/ARB_blend_func_extended.xml | 0 .../glapi}/glapi/gen/ARB_clear_buffer_object.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_clear_texture.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_clip_control.xml | 0 .../glapi}/glapi/gen/ARB_color_buffer_float.xml | 0 .../glapi/gen/ARB_compressed_texture_pixel_storage.xml | 0 .../glapi}/glapi/gen/ARB_compute_shader.xml | 0 .../glapi}/glapi/gen/ARB_compute_variable_group_size.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_copy_buffer.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_copy_image.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_debug_output.xml | 0 .../glapi}/glapi/gen/ARB_depth_buffer_float.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_depth_clamp.xml | 0 .../glapi}/glapi/gen/ARB_direct_state_access.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_draw_buffers.xml | 0 .../glapi}/glapi/gen/ARB_draw_buffers_blend.xml | 0 .../glapi}/glapi/gen/ARB_draw_elements_base_vertex.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_draw_indirect.xml | 0 .../glapi}/glapi/gen/ARB_draw_instanced.xml | 0 .../glapi}/glapi/gen/ARB_framebuffer_no_attachments.xml | 0 .../glapi}/glapi/gen/ARB_framebuffer_object.xml | 0 .../glapi}/glapi/gen/ARB_get_program_binary.xml | 0 .../glapi}/glapi/gen/ARB_get_texture_sub_image.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_gl_spirv.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_gpu_shader5.xml | 0 .../glapi}/glapi/gen/ARB_gpu_shader_fp64.xml | 0 .../glapi}/glapi/gen/ARB_gpu_shader_int64.xml | 0 .../glapi}/glapi/gen/ARB_indirect_parameters.xml | 0 .../glapi}/glapi/gen/ARB_instanced_arrays.xml | 0 .../glapi}/glapi/gen/ARB_internalformat_query.xml | 0 .../glapi}/glapi/gen/ARB_internalformat_query2.xml | 0 .../glapi}/glapi/gen/ARB_invalidate_subdata.xml | 0 .../glapi}/glapi/gen/ARB_map_buffer_range.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_multi_bind.xml | 0 .../glapi}/glapi/gen/ARB_pipeline_statistics_query.xml | 0 .../glapi}/glapi/gen/ARB_program_interface_query.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_robustness.xml | 0 .../glapi}/glapi/gen/ARB_sample_shading.xml | 0 .../glapi}/glapi/gen/ARB_sampler_objects.xml | 0 .../glapi}/glapi/gen/ARB_seamless_cube_map.xml | 0 .../glapi}/glapi/gen/ARB_separate_shader_objects.xml | 0 .../glapi}/glapi/gen/ARB_shader_atomic_counters.xml | 0 .../glapi}/glapi/gen/ARB_shader_image_load_store.xml | 0 .../glapi/gen/ARB_shader_storage_buffer_object.xml | 0 .../glapi}/glapi/gen/ARB_shader_subroutine.xml | 0 .../glapi}/glapi/gen/ARB_shading_language_include.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_sparse_buffer.xml | 0 .../glapi}/glapi/gen/ARB_sparse_texture.xml | 0 .../glapi}/glapi/gen/ARB_spirv_extensions.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_sync.xml | 0 .../glapi}/glapi/gen/ARB_tessellation_shader.xml | 0 .../glapi}/glapi/gen/ARB_texture_barrier.xml | 0 .../glapi}/glapi/gen/ARB_texture_buffer_object.xml | 0 .../glapi}/glapi/gen/ARB_texture_buffer_range.xml | 0 .../glapi}/glapi/gen/ARB_texture_compression_rgtc.xml | 0 .../glapi}/glapi/gen/ARB_texture_cube_map_array.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_float.xml | 0 .../glapi}/glapi/gen/ARB_texture_gather.xml | 0 .../glapi}/glapi/gen/ARB_texture_multisample.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_rg.xml | 0 .../glapi}/glapi/gen/ARB_texture_rgb10_a2ui.xml | 0 .../glapi}/glapi/gen/ARB_texture_storage.xml | 0 .../glapi}/glapi/gen/ARB_texture_storage_multisample.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_view.xml | 0 .../glapi}/glapi/gen/ARB_uniform_buffer_object.xml | 0 .../glapi}/glapi/gen/ARB_vertex_array_object.xml | 0 .../glapi}/glapi/gen/ARB_vertex_attrib_64bit.xml | 0 .../glapi}/glapi/gen/ARB_vertex_attrib_binding.xml | 0 .../glapi}/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml | 0 .../glapi}/glapi/gen/ARB_viewport_array.xml | 0 .../glapi}/glapi/gen/EXT_EGL_image_storage.xml | 0 .../glapi}/glapi/gen/EXT_direct_state_access.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/EXT_draw_buffers2.xml | 0 .../glapi}/glapi/gen/EXT_external_objects.xml | 0 .../glapi}/glapi/gen/EXT_external_objects_fd.xml | 0 .../glapi}/glapi/gen/EXT_external_objects_win32.xml | 0 .../glapi}/glapi/gen/EXT_framebuffer_object.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/EXT_gpu_shader4.xml | 0 .../glapi/gen/EXT_multisampled_render_to_texture.xml | 0 .../glapi}/glapi/gen/EXT_packed_depth_stencil.xml | 0 .../glapi}/glapi/gen/EXT_provoking_vertex.xml | 0 .../glapi}/glapi/gen/EXT_separate_shader_objects.xml | 0 .../glapi}/glapi/gen/EXT_shader_image_load_store.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/EXT_texture_array.xml | 0 .../glapi}/glapi/gen/EXT_texture_integer.xml | 0 .../glapi}/glapi/gen/EXT_texture_storage.xml | 0 .../glapi}/glapi/gen/EXT_texture_storage_compression.xml | 0 .../glapi}/glapi/gen/EXT_transform_feedback.xml | 0 .../glapi}/glapi/gen/EXT_vertex_attrib_64bit.xml | 0 .../glapi}/glapi/gen/EXT_window_rectangles.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/GL3x.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/GL4x.xml | 0 .../glapi}/glapi/gen/GREMEDY_string_marker.xml | 0 .../glapi}/glapi/gen/INTEL_performance_query.xml | 0 .../glapi}/glapi/gen/KHR_context_flush_control.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/KHR_debug.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/KHR_robustness.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/KHR_robustness_es.xml | 0 .../glapi}/glapi/gen/KHR_shader_subgroup.xml | 0 .../glapi}/glapi/gen/KHR_texture_compression_astc.xml | 0 .../glapi}/glapi/gen/MESA_tile_raster_order.xml | 0 .../glapi/gen/NV_alpha_to_coverage_dither_control.xml | 0 .../glapi}/glapi/gen/NV_conditional_render.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/NV_copy_image.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/NV_half_float.xml | 0 .../glapi}/glapi/gen/NV_primitive_restart.xml | 0 .../glapi}/glapi/gen/NV_texture_barrier.xml | 0 .../glapi}/glapi/gen/NV_timeline_semaphore.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/NV_vdpau_interop.xml | 0 .../glapi}/glapi/gen/NV_viewport_swizzle.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/OES_EGL_image.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/OES_fixed_point.xml | 0 .../glapi}/glapi/gen/OES_single_precision.xml | 0 .../glapi}/glapi/gen/OES_texture_compression_astc.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/OVR_multiview.xml | 0 .../gen/OVR_multiview_multisampled_render_to_texture.xml | 0 .../glapi}/glapi/gen/api_beginend_init_h.py | 0 src/{mapi => mesa/glapi}/glapi/gen/api_exec_decl_h.py | 0 src/{mapi => mesa/glapi}/glapi/gen/api_exec_init.py | 2 +- .../glapi}/glapi/gen/api_hw_select_init_h.py | 0 src/{mapi => mesa/glapi}/glapi/gen/api_save_h.py | 0 src/{mapi => mesa/glapi}/glapi/gen/api_save_init_h.py | 0 src/{mapi => mesa/glapi}/glapi/gen/apiexec.py | 0 src/{mapi => mesa/glapi}/glapi/gen/es_EXT.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/glX_API.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/glX_XML.py | 0 src/{mapi => mesa/glapi}/glapi/gen/glX_proto_common.py | 0 src/{mapi => mesa/glapi}/glapi/gen/glX_proto_send.py | 0 src/{mapi => mesa/glapi}/glapi/gen/glX_proto_size.py | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_API.dtd | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_API.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_XML.py | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_and_es_API.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_and_glX_API.xml | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_enums.py | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_gentable.py | 0 src/{mapi => mesa/glapi}/glapi/gen/gl_table.py | 0 src/{mapi => mesa/glapi}/glapi/gen/license.py | 0 src/{mapi => mesa/glapi}/glapi/gen/marshal_XML.py | 0 .../glapi}/glapi/gen/marshal_generated_c.py | 0 .../glapi}/glapi/gen/marshal_generated_h.py | 0 src/{mapi => mesa/glapi}/glapi/gen/meson.build | 0 src/{mapi => mesa/glapi}/glapi/gen/static_data.py | 2 +- src/{mapi => mesa/glapi}/glapi/gen/typeexpr.py | 0 src/{mapi => mesa/glapi}/glapi/gen/unmarshal_table_c.py | 0 src/{mapi => mesa/glapi}/glapi/glapi.h | 0 src/{mapi => mesa/glapi}/glapi/libgl_public.c | 2 +- src/{mapi => mesa/glapi}/glapi/meson.build | 0 src/{mapi => mesa/glapi}/glapi/registry/gl.xml | 0 src/{mapi => mesa/glapi}/mapi_abi.py | 0 src/{mapi => mesa/glapi}/meson.build | 2 +- src/{mapi => mesa/glapi}/new/genCommon.py | 0 src/{mapi => mesa/glapi}/new/gen_gldispatch_mapi.py | 0 src/{mapi => mesa/glapi}/shared-glapi/core.c | 0 src/{mapi => mesa/glapi}/shared-glapi/meson.build | 0 src/mesa/main/get_hash_generator.py | 2 +- src/mesa/meson.build | 3 ++- src/meson.build | 9 +++------ 189 files changed, 26 insertions(+), 29 deletions(-) rename src/{mapi => mesa/glapi}/entry_ppc64le_tls.h (100%) rename src/{mapi => mesa/glapi}/entry_x86-64_tls.h (100%) rename src/{mapi => mesa/glapi}/entry_x86_tls.h (100%) rename src/{mapi => mesa/glapi}/es1api/gles1-symbols.txt (100%) rename src/{mapi => mesa/glapi}/es1api/gles1.def.in (100%) rename src/{mapi => mesa/glapi}/es1api/libgles1_public.c (96%) rename src/{mapi => mesa/glapi}/es1api/meson.build (98%) rename src/{mapi => mesa/glapi}/es2api/gles2-symbols.txt (100%) rename src/{mapi => mesa/glapi}/es2api/gles2.def.in (100%) rename src/{mapi => mesa/glapi}/es2api/libgles2_public.c (96%) rename src/{mapi => mesa/glapi}/es2api/meson.build (98%) rename src/{mapi => mesa/glapi}/glapi/gen/AMD_depth_clamp_separate.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/AMD_draw_buffers_blend.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/AMD_gpu_shader_int64.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/AMD_performance_monitor.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_ES2_compatibility.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_ES3_compatibility.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_base_instance.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_bindless_texture.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_blend_func_extended.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_clear_buffer_object.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_clear_texture.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_clip_control.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_color_buffer_float.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_compressed_texture_pixel_storage.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_compute_shader.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_compute_variable_group_size.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_copy_buffer.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_copy_image.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_debug_output.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_depth_buffer_float.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_depth_clamp.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_direct_state_access.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_draw_buffers.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_draw_buffers_blend.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_draw_elements_base_vertex.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_draw_indirect.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_draw_instanced.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_framebuffer_no_attachments.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_framebuffer_object.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_get_program_binary.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_get_texture_sub_image.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_gl_spirv.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_gpu_shader5.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_gpu_shader_fp64.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_gpu_shader_int64.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_indirect_parameters.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_instanced_arrays.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_internalformat_query.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_internalformat_query2.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_invalidate_subdata.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_map_buffer_range.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_multi_bind.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_pipeline_statistics_query.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_program_interface_query.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_robustness.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_sample_shading.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_sampler_objects.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_seamless_cube_map.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_separate_shader_objects.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_shader_atomic_counters.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_shader_image_load_store.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_shader_storage_buffer_object.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_shader_subroutine.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_shading_language_include.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_sparse_buffer.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_sparse_texture.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_spirv_extensions.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_sync.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_tessellation_shader.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_barrier.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_buffer_object.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_buffer_range.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_compression_rgtc.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_cube_map_array.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_float.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_gather.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_multisample.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_rg.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_rgb10_a2ui.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_storage.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_storage_multisample.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_texture_view.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_uniform_buffer_object.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_vertex_array_object.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_vertex_attrib_64bit.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_vertex_attrib_binding.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/ARB_viewport_array.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_EGL_image_storage.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_direct_state_access.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_draw_buffers2.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_external_objects.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_external_objects_fd.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_external_objects_win32.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_framebuffer_object.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_gpu_shader4.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_multisampled_render_to_texture.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_packed_depth_stencil.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_provoking_vertex.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_separate_shader_objects.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_shader_image_load_store.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_texture_array.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_texture_integer.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_texture_storage.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_texture_storage_compression.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_transform_feedback.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_vertex_attrib_64bit.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/EXT_window_rectangles.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/GL3x.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/GL4x.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/GREMEDY_string_marker.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/INTEL_performance_query.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/KHR_context_flush_control.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/KHR_debug.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/KHR_robustness.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/KHR_robustness_es.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/KHR_shader_subgroup.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/KHR_texture_compression_astc.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/MESA_tile_raster_order.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_alpha_to_coverage_dither_control.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_conditional_render.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_copy_image.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_half_float.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_primitive_restart.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_texture_barrier.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_timeline_semaphore.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_vdpau_interop.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/NV_viewport_swizzle.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/OES_EGL_image.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/OES_fixed_point.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/OES_single_precision.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/OES_texture_compression_astc.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/OVR_multiview.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/OVR_multiview_multisampled_render_to_texture.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/api_beginend_init_h.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/api_exec_decl_h.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/api_exec_init.py (99%) rename src/{mapi => mesa/glapi}/glapi/gen/api_hw_select_init_h.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/api_save_h.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/api_save_init_h.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/apiexec.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/es_EXT.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/glX_API.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/glX_XML.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/glX_proto_common.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/glX_proto_send.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/glX_proto_size.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_API.dtd (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_API.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_XML.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_and_es_API.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_and_glX_API.xml (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_enums.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_gentable.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/gl_table.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/license.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/marshal_XML.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/marshal_generated_c.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/marshal_generated_h.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/meson.build (100%) rename src/{mapi => mesa/glapi}/glapi/gen/static_data.py (99%) rename src/{mapi => mesa/glapi}/glapi/gen/typeexpr.py (100%) rename src/{mapi => mesa/glapi}/glapi/gen/unmarshal_table_c.py (100%) rename src/{mapi => mesa/glapi}/glapi/glapi.h (100%) rename src/{mapi => mesa/glapi}/glapi/libgl_public.c (96%) rename src/{mapi => mesa/glapi}/glapi/meson.build (100%) rename src/{mapi => mesa/glapi}/glapi/registry/gl.xml (100%) rename src/{mapi => mesa/glapi}/mapi_abi.py (100%) rename src/{mapi => mesa/glapi}/meson.build (99%) rename src/{mapi => mesa/glapi}/new/genCommon.py (100%) rename src/{mapi => mesa/glapi}/new/gen_gldispatch_mapi.py (100%) rename src/{mapi => mesa/glapi}/shared-glapi/core.c (100%) rename src/{mapi => mesa/glapi}/shared-glapi/meson.build (100%) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index aa31fff54f9..81ed4a47375 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -64,7 +64,7 @@ #include "GL/mesa_glinterop.h" #include "pipe-loader/pipe_loader.h" #include "loader/loader.h" -#include "mapi/glapi/glapi.h" +#include "mesa/glapi/glapi/glapi.h" #include "pipe/p_screen.h" #include "util/bitscan.h" #include "util/driconf.h" @@ -76,7 +76,6 @@ #include "util/u_vector.h" #include "egl_dri2.h" #include "egldefines.h" -#include "mapi/glapi/glapi.h" #include "dispatch.h" #define NUM_ATTRIBS 16 diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp index ce7c0222767..f2f75c065cc 100644 --- a/src/egl/drivers/haiku/egl_haiku.cpp +++ b/src/egl/drivers/haiku/egl_haiku.cpp @@ -44,7 +44,7 @@ #include "pipe/p_defines.h" #include "state_tracker/st_context.h" #include "util/u_atomic.h" -#include +#include "mesa/glapi/glapi/glapi.h" #include "hgl/hgl_sw_winsys.h" #include "hgl_context.h" diff --git a/src/egl/drivers/wgl/egl_wgl.c b/src/egl/drivers/wgl/egl_wgl.c index e2c55bc811c..2dc596076c7 100644 --- a/src/egl/drivers/wgl/egl_wgl.c +++ b/src/egl/drivers/wgl/egl_wgl.c @@ -46,7 +46,7 @@ #include #include "util/u_call_once.h" -#include "mapi/glapi/glapi.h" +#include "mesa/glapi/glapi/glapi.h" #include "dispatch.h" #include diff --git a/src/egl/generate/gen_egl_dispatch.py b/src/egl/generate/gen_egl_dispatch.py index af14ddfe94c..71613f4a451 100644 --- a/src/egl/generate/gen_egl_dispatch.py +++ b/src/egl/generate/gen_egl_dispatch.py @@ -39,7 +39,7 @@ import sys import textwrap import os -NEWAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mapi", "new") +NEWAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mesa", "glapi", "new") sys.path.insert(0, NEWAPI) import genCommon diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 76f6e4cd2df..7737bb37643 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -86,7 +86,7 @@ #include #include #include "c11/threads.h" -#include "mapi/glapi/glapi.h" +#include "mesa/glapi/glapi/glapi.h" #include "util/detect_os.h" #include "util/macros.h" #include "util/perf/cpu_trace.h" diff --git a/src/gallium/frontends/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c index bb661031913..04d72c93af5 100644 --- a/src/gallium/frontends/glx/xlib/glx_api.c +++ b/src/gallium/frontends/glx/xlib/glx_api.c @@ -42,7 +42,7 @@ #include "main/errors.h" #include "main/config.h" #include "dispatch.h" -#include "mapi/glapi/glapi.h" +#include "mesa/glapi/glapi/glapi.h" #include "util/compiler.h" #include "util/u_math.h" #include "util/u_memory.h" diff --git a/src/gallium/frontends/glx/xlib/glx_getproc.c b/src/gallium/frontends/glx/xlib/glx_getproc.c index 582e36fbad0..bac8ade0dff 100644 --- a/src/gallium/frontends/glx/xlib/glx_getproc.c +++ b/src/gallium/frontends/glx/xlib/glx_getproc.c @@ -34,7 +34,7 @@ #include #include "util/compiler.h" #include "GL/glx.h" -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" struct name_address_pair { diff --git a/src/gallium/frontends/glx/xlib/glx_usefont.c b/src/gallium/frontends/glx/xlib/glx_usefont.c index ddf9aeea43b..8ec20e4db25 100644 --- a/src/gallium/frontends/glx/xlib/glx_usefont.c +++ b/src/gallium/frontends/glx/xlib/glx_usefont.c @@ -35,7 +35,7 @@ #include #include "main/errors.h" #include "dispatch.h" -#include "mapi/glapi/glapi.h" +#include "mesa/glapi/glapi/glapi.h" /* Some debugging info. */ diff --git a/src/gallium/frontends/wgl/stw_device.c b/src/gallium/frontends/wgl/stw_device.c index c6ba8b0f22b..9b098e02036 100644 --- a/src/gallium/frontends/wgl/stw_device.c +++ b/src/gallium/frontends/wgl/stw_device.c @@ -29,7 +29,7 @@ #include -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" #include "util/u_debug.h" #include "util/u_math.h" #include "util/u_memory.h" diff --git a/src/gallium/frontends/wgl/stw_getprocaddress.c b/src/gallium/frontends/wgl/stw_getprocaddress.c index 7fd4bb2f71a..b879ad0386d 100644 --- a/src/gallium/frontends/wgl/stw_getprocaddress.c +++ b/src/gallium/frontends/wgl/stw_getprocaddress.c @@ -33,7 +33,7 @@ #include #include -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" #include "stw_device.h" #include "stw_gdishim.h" #include "gldrv.h" diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 5f9b674c1c8..a5b35e73753 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -43,7 +43,7 @@ #include "kopper_interface.h" #include "loader_dri_helper.h" #include "dri_util.h" -#include "mapi/glapi/glapi.h" +#include "mesa/glapi/glapi/glapi.h" #include "dispatch.h" static int xshm_error = 0; diff --git a/src/glx/xfont.c b/src/glx/xfont.c index d503d409db7..472dfb5dfc1 100644 --- a/src/glx/xfont.c +++ b/src/glx/xfont.c @@ -36,7 +36,7 @@ #ifdef GLX_DIRECT_RENDERING #include "glxclient.h" -#include "mapi/glapi/glapi.h" +#include "mesa/glapi/glapi/glapi.h" #include "dispatch.h" /* Implementation. */ diff --git a/src/mapi/entry_ppc64le_tls.h b/src/mesa/glapi/entry_ppc64le_tls.h similarity index 100% rename from src/mapi/entry_ppc64le_tls.h rename to src/mesa/glapi/entry_ppc64le_tls.h diff --git a/src/mapi/entry_x86-64_tls.h b/src/mesa/glapi/entry_x86-64_tls.h similarity index 100% rename from src/mapi/entry_x86-64_tls.h rename to src/mesa/glapi/entry_x86-64_tls.h diff --git a/src/mapi/entry_x86_tls.h b/src/mesa/glapi/entry_x86_tls.h similarity index 100% rename from src/mapi/entry_x86_tls.h rename to src/mesa/glapi/entry_x86_tls.h diff --git a/src/mapi/es1api/gles1-symbols.txt b/src/mesa/glapi/es1api/gles1-symbols.txt similarity index 100% rename from src/mapi/es1api/gles1-symbols.txt rename to src/mesa/glapi/es1api/gles1-symbols.txt diff --git a/src/mapi/es1api/gles1.def.in b/src/mesa/glapi/es1api/gles1.def.in similarity index 100% rename from src/mapi/es1api/gles1.def.in rename to src/mesa/glapi/es1api/gles1.def.in diff --git a/src/mapi/es1api/libgles1_public.c b/src/mesa/glapi/es1api/libgles1_public.c similarity index 96% rename from src/mapi/es1api/libgles1_public.c rename to src/mesa/glapi/es1api/libgles1_public.c index 3f491b3a1b5..c6e391454b5 100644 --- a/src/mapi/es1api/libgles1_public.c +++ b/src/mesa/glapi/es1api/libgles1_public.c @@ -5,7 +5,7 @@ * Chia-I Wu */ -#include "glapi/glapi.h" +#include "../glapi/glapi.h" /* REALLY_INITIAL_EXEC implies __GLIBC__ */ #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC) diff --git a/src/mapi/es1api/meson.build b/src/mesa/glapi/es1api/meson.build similarity index 98% rename from src/mapi/es1api/meson.build rename to src/mesa/glapi/es1api/meson.build index 67576452d1e..b5dd6398942 100644 --- a/src/mapi/es1api/meson.build +++ b/src/mesa/glapi/es1api/meson.build @@ -61,6 +61,6 @@ if with_symbols_check '--symbols-file', files('gles1-symbols.txt'), symbols_check_args, ], - suite : ['mapi'], + suite : ['glapi'], ) endif diff --git a/src/mapi/es2api/gles2-symbols.txt b/src/mesa/glapi/es2api/gles2-symbols.txt similarity index 100% rename from src/mapi/es2api/gles2-symbols.txt rename to src/mesa/glapi/es2api/gles2-symbols.txt diff --git a/src/mapi/es2api/gles2.def.in b/src/mesa/glapi/es2api/gles2.def.in similarity index 100% rename from src/mapi/es2api/gles2.def.in rename to src/mesa/glapi/es2api/gles2.def.in diff --git a/src/mapi/es2api/libgles2_public.c b/src/mesa/glapi/es2api/libgles2_public.c similarity index 96% rename from src/mapi/es2api/libgles2_public.c rename to src/mesa/glapi/es2api/libgles2_public.c index 1c0d08499c1..28149e57475 100644 --- a/src/mapi/es2api/libgles2_public.c +++ b/src/mesa/glapi/es2api/libgles2_public.c @@ -5,7 +5,7 @@ * Chia-I Wu */ -#include "glapi/glapi.h" +#include "../glapi/glapi.h" /* REALLY_INITIAL_EXEC implies __GLIBC__ */ #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC) diff --git a/src/mapi/es2api/meson.build b/src/mesa/glapi/es2api/meson.build similarity index 98% rename from src/mapi/es2api/meson.build rename to src/mesa/glapi/es2api/meson.build index 8202e039961..3cc94c796b3 100644 --- a/src/mapi/es2api/meson.build +++ b/src/mesa/glapi/es2api/meson.build @@ -61,6 +61,6 @@ if with_symbols_check '--symbols-file', files('gles2-symbols.txt'), symbols_check_args, ], - suite : ['mapi'], + suite : ['glapi'], ) endif diff --git a/src/mapi/glapi/gen/AMD_depth_clamp_separate.xml b/src/mesa/glapi/glapi/gen/AMD_depth_clamp_separate.xml similarity index 100% rename from src/mapi/glapi/gen/AMD_depth_clamp_separate.xml rename to src/mesa/glapi/glapi/gen/AMD_depth_clamp_separate.xml diff --git a/src/mapi/glapi/gen/AMD_draw_buffers_blend.xml b/src/mesa/glapi/glapi/gen/AMD_draw_buffers_blend.xml similarity index 100% rename from src/mapi/glapi/gen/AMD_draw_buffers_blend.xml rename to src/mesa/glapi/glapi/gen/AMD_draw_buffers_blend.xml diff --git a/src/mapi/glapi/gen/AMD_gpu_shader_int64.xml b/src/mesa/glapi/glapi/gen/AMD_gpu_shader_int64.xml similarity index 100% rename from src/mapi/glapi/gen/AMD_gpu_shader_int64.xml rename to src/mesa/glapi/glapi/gen/AMD_gpu_shader_int64.xml diff --git a/src/mapi/glapi/gen/AMD_performance_monitor.xml b/src/mesa/glapi/glapi/gen/AMD_performance_monitor.xml similarity index 100% rename from src/mapi/glapi/gen/AMD_performance_monitor.xml rename to src/mesa/glapi/glapi/gen/AMD_performance_monitor.xml diff --git a/src/mapi/glapi/gen/ARB_ES2_compatibility.xml b/src/mesa/glapi/glapi/gen/ARB_ES2_compatibility.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_ES2_compatibility.xml rename to src/mesa/glapi/glapi/gen/ARB_ES2_compatibility.xml diff --git a/src/mapi/glapi/gen/ARB_ES3_compatibility.xml b/src/mesa/glapi/glapi/gen/ARB_ES3_compatibility.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_ES3_compatibility.xml rename to src/mesa/glapi/glapi/gen/ARB_ES3_compatibility.xml diff --git a/src/mapi/glapi/gen/ARB_base_instance.xml b/src/mesa/glapi/glapi/gen/ARB_base_instance.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_base_instance.xml rename to src/mesa/glapi/glapi/gen/ARB_base_instance.xml diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml b/src/mesa/glapi/glapi/gen/ARB_bindless_texture.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_bindless_texture.xml rename to src/mesa/glapi/glapi/gen/ARB_bindless_texture.xml diff --git a/src/mapi/glapi/gen/ARB_blend_func_extended.xml b/src/mesa/glapi/glapi/gen/ARB_blend_func_extended.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_blend_func_extended.xml rename to src/mesa/glapi/glapi/gen/ARB_blend_func_extended.xml diff --git a/src/mapi/glapi/gen/ARB_clear_buffer_object.xml b/src/mesa/glapi/glapi/gen/ARB_clear_buffer_object.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_clear_buffer_object.xml rename to src/mesa/glapi/glapi/gen/ARB_clear_buffer_object.xml diff --git a/src/mapi/glapi/gen/ARB_clear_texture.xml b/src/mesa/glapi/glapi/gen/ARB_clear_texture.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_clear_texture.xml rename to src/mesa/glapi/glapi/gen/ARB_clear_texture.xml diff --git a/src/mapi/glapi/gen/ARB_clip_control.xml b/src/mesa/glapi/glapi/gen/ARB_clip_control.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_clip_control.xml rename to src/mesa/glapi/glapi/gen/ARB_clip_control.xml diff --git a/src/mapi/glapi/gen/ARB_color_buffer_float.xml b/src/mesa/glapi/glapi/gen/ARB_color_buffer_float.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_color_buffer_float.xml rename to src/mesa/glapi/glapi/gen/ARB_color_buffer_float.xml diff --git a/src/mapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml b/src/mesa/glapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml rename to src/mesa/glapi/glapi/gen/ARB_compressed_texture_pixel_storage.xml diff --git a/src/mapi/glapi/gen/ARB_compute_shader.xml b/src/mesa/glapi/glapi/gen/ARB_compute_shader.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_compute_shader.xml rename to src/mesa/glapi/glapi/gen/ARB_compute_shader.xml diff --git a/src/mapi/glapi/gen/ARB_compute_variable_group_size.xml b/src/mesa/glapi/glapi/gen/ARB_compute_variable_group_size.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_compute_variable_group_size.xml rename to src/mesa/glapi/glapi/gen/ARB_compute_variable_group_size.xml diff --git a/src/mapi/glapi/gen/ARB_copy_buffer.xml b/src/mesa/glapi/glapi/gen/ARB_copy_buffer.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_copy_buffer.xml rename to src/mesa/glapi/glapi/gen/ARB_copy_buffer.xml diff --git a/src/mapi/glapi/gen/ARB_copy_image.xml b/src/mesa/glapi/glapi/gen/ARB_copy_image.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_copy_image.xml rename to src/mesa/glapi/glapi/gen/ARB_copy_image.xml diff --git a/src/mapi/glapi/gen/ARB_debug_output.xml b/src/mesa/glapi/glapi/gen/ARB_debug_output.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_debug_output.xml rename to src/mesa/glapi/glapi/gen/ARB_debug_output.xml diff --git a/src/mapi/glapi/gen/ARB_depth_buffer_float.xml b/src/mesa/glapi/glapi/gen/ARB_depth_buffer_float.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_depth_buffer_float.xml rename to src/mesa/glapi/glapi/gen/ARB_depth_buffer_float.xml diff --git a/src/mapi/glapi/gen/ARB_depth_clamp.xml b/src/mesa/glapi/glapi/gen/ARB_depth_clamp.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_depth_clamp.xml rename to src/mesa/glapi/glapi/gen/ARB_depth_clamp.xml diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mesa/glapi/glapi/gen/ARB_direct_state_access.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_direct_state_access.xml rename to src/mesa/glapi/glapi/gen/ARB_direct_state_access.xml diff --git a/src/mapi/glapi/gen/ARB_draw_buffers.xml b/src/mesa/glapi/glapi/gen/ARB_draw_buffers.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_draw_buffers.xml rename to src/mesa/glapi/glapi/gen/ARB_draw_buffers.xml diff --git a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/src/mesa/glapi/glapi/gen/ARB_draw_buffers_blend.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_draw_buffers_blend.xml rename to src/mesa/glapi/glapi/gen/ARB_draw_buffers_blend.xml diff --git a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/src/mesa/glapi/glapi/gen/ARB_draw_elements_base_vertex.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml rename to src/mesa/glapi/glapi/gen/ARB_draw_elements_base_vertex.xml diff --git a/src/mapi/glapi/gen/ARB_draw_indirect.xml b/src/mesa/glapi/glapi/gen/ARB_draw_indirect.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_draw_indirect.xml rename to src/mesa/glapi/glapi/gen/ARB_draw_indirect.xml diff --git a/src/mapi/glapi/gen/ARB_draw_instanced.xml b/src/mesa/glapi/glapi/gen/ARB_draw_instanced.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_draw_instanced.xml rename to src/mesa/glapi/glapi/gen/ARB_draw_instanced.xml diff --git a/src/mapi/glapi/gen/ARB_framebuffer_no_attachments.xml b/src/mesa/glapi/glapi/gen/ARB_framebuffer_no_attachments.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_framebuffer_no_attachments.xml rename to src/mesa/glapi/glapi/gen/ARB_framebuffer_no_attachments.xml diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mesa/glapi/glapi/gen/ARB_framebuffer_object.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_framebuffer_object.xml rename to src/mesa/glapi/glapi/gen/ARB_framebuffer_object.xml diff --git a/src/mapi/glapi/gen/ARB_get_program_binary.xml b/src/mesa/glapi/glapi/gen/ARB_get_program_binary.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_get_program_binary.xml rename to src/mesa/glapi/glapi/gen/ARB_get_program_binary.xml diff --git a/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml b/src/mesa/glapi/glapi/gen/ARB_get_texture_sub_image.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_get_texture_sub_image.xml rename to src/mesa/glapi/glapi/gen/ARB_get_texture_sub_image.xml diff --git a/src/mapi/glapi/gen/ARB_gl_spirv.xml b/src/mesa/glapi/glapi/gen/ARB_gl_spirv.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_gl_spirv.xml rename to src/mesa/glapi/glapi/gen/ARB_gl_spirv.xml diff --git a/src/mapi/glapi/gen/ARB_gpu_shader5.xml b/src/mesa/glapi/glapi/gen/ARB_gpu_shader5.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_gpu_shader5.xml rename to src/mesa/glapi/glapi/gen/ARB_gpu_shader5.xml diff --git a/src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml b/src/mesa/glapi/glapi/gen/ARB_gpu_shader_fp64.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml rename to src/mesa/glapi/glapi/gen/ARB_gpu_shader_fp64.xml diff --git a/src/mapi/glapi/gen/ARB_gpu_shader_int64.xml b/src/mesa/glapi/glapi/gen/ARB_gpu_shader_int64.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_gpu_shader_int64.xml rename to src/mesa/glapi/glapi/gen/ARB_gpu_shader_int64.xml diff --git a/src/mapi/glapi/gen/ARB_indirect_parameters.xml b/src/mesa/glapi/glapi/gen/ARB_indirect_parameters.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_indirect_parameters.xml rename to src/mesa/glapi/glapi/gen/ARB_indirect_parameters.xml diff --git a/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/src/mesa/glapi/glapi/gen/ARB_instanced_arrays.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_instanced_arrays.xml rename to src/mesa/glapi/glapi/gen/ARB_instanced_arrays.xml diff --git a/src/mapi/glapi/gen/ARB_internalformat_query.xml b/src/mesa/glapi/glapi/gen/ARB_internalformat_query.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_internalformat_query.xml rename to src/mesa/glapi/glapi/gen/ARB_internalformat_query.xml diff --git a/src/mapi/glapi/gen/ARB_internalformat_query2.xml b/src/mesa/glapi/glapi/gen/ARB_internalformat_query2.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_internalformat_query2.xml rename to src/mesa/glapi/glapi/gen/ARB_internalformat_query2.xml diff --git a/src/mapi/glapi/gen/ARB_invalidate_subdata.xml b/src/mesa/glapi/glapi/gen/ARB_invalidate_subdata.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_invalidate_subdata.xml rename to src/mesa/glapi/glapi/gen/ARB_invalidate_subdata.xml diff --git a/src/mapi/glapi/gen/ARB_map_buffer_range.xml b/src/mesa/glapi/glapi/gen/ARB_map_buffer_range.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_map_buffer_range.xml rename to src/mesa/glapi/glapi/gen/ARB_map_buffer_range.xml diff --git a/src/mapi/glapi/gen/ARB_multi_bind.xml b/src/mesa/glapi/glapi/gen/ARB_multi_bind.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_multi_bind.xml rename to src/mesa/glapi/glapi/gen/ARB_multi_bind.xml diff --git a/src/mapi/glapi/gen/ARB_pipeline_statistics_query.xml b/src/mesa/glapi/glapi/gen/ARB_pipeline_statistics_query.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_pipeline_statistics_query.xml rename to src/mesa/glapi/glapi/gen/ARB_pipeline_statistics_query.xml diff --git a/src/mapi/glapi/gen/ARB_program_interface_query.xml b/src/mesa/glapi/glapi/gen/ARB_program_interface_query.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_program_interface_query.xml rename to src/mesa/glapi/glapi/gen/ARB_program_interface_query.xml diff --git a/src/mapi/glapi/gen/ARB_robustness.xml b/src/mesa/glapi/glapi/gen/ARB_robustness.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_robustness.xml rename to src/mesa/glapi/glapi/gen/ARB_robustness.xml diff --git a/src/mapi/glapi/gen/ARB_sample_shading.xml b/src/mesa/glapi/glapi/gen/ARB_sample_shading.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_sample_shading.xml rename to src/mesa/glapi/glapi/gen/ARB_sample_shading.xml diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mesa/glapi/glapi/gen/ARB_sampler_objects.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_sampler_objects.xml rename to src/mesa/glapi/glapi/gen/ARB_sampler_objects.xml diff --git a/src/mapi/glapi/gen/ARB_seamless_cube_map.xml b/src/mesa/glapi/glapi/gen/ARB_seamless_cube_map.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_seamless_cube_map.xml rename to src/mesa/glapi/glapi/gen/ARB_seamless_cube_map.xml diff --git a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml b/src/mesa/glapi/glapi/gen/ARB_separate_shader_objects.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_separate_shader_objects.xml rename to src/mesa/glapi/glapi/gen/ARB_separate_shader_objects.xml diff --git a/src/mapi/glapi/gen/ARB_shader_atomic_counters.xml b/src/mesa/glapi/glapi/gen/ARB_shader_atomic_counters.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_shader_atomic_counters.xml rename to src/mesa/glapi/glapi/gen/ARB_shader_atomic_counters.xml diff --git a/src/mapi/glapi/gen/ARB_shader_image_load_store.xml b/src/mesa/glapi/glapi/gen/ARB_shader_image_load_store.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_shader_image_load_store.xml rename to src/mesa/glapi/glapi/gen/ARB_shader_image_load_store.xml diff --git a/src/mapi/glapi/gen/ARB_shader_storage_buffer_object.xml b/src/mesa/glapi/glapi/gen/ARB_shader_storage_buffer_object.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_shader_storage_buffer_object.xml rename to src/mesa/glapi/glapi/gen/ARB_shader_storage_buffer_object.xml diff --git a/src/mapi/glapi/gen/ARB_shader_subroutine.xml b/src/mesa/glapi/glapi/gen/ARB_shader_subroutine.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_shader_subroutine.xml rename to src/mesa/glapi/glapi/gen/ARB_shader_subroutine.xml diff --git a/src/mapi/glapi/gen/ARB_shading_language_include.xml b/src/mesa/glapi/glapi/gen/ARB_shading_language_include.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_shading_language_include.xml rename to src/mesa/glapi/glapi/gen/ARB_shading_language_include.xml diff --git a/src/mapi/glapi/gen/ARB_sparse_buffer.xml b/src/mesa/glapi/glapi/gen/ARB_sparse_buffer.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_sparse_buffer.xml rename to src/mesa/glapi/glapi/gen/ARB_sparse_buffer.xml diff --git a/src/mapi/glapi/gen/ARB_sparse_texture.xml b/src/mesa/glapi/glapi/gen/ARB_sparse_texture.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_sparse_texture.xml rename to src/mesa/glapi/glapi/gen/ARB_sparse_texture.xml diff --git a/src/mapi/glapi/gen/ARB_spirv_extensions.xml b/src/mesa/glapi/glapi/gen/ARB_spirv_extensions.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_spirv_extensions.xml rename to src/mesa/glapi/glapi/gen/ARB_spirv_extensions.xml diff --git a/src/mapi/glapi/gen/ARB_sync.xml b/src/mesa/glapi/glapi/gen/ARB_sync.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_sync.xml rename to src/mesa/glapi/glapi/gen/ARB_sync.xml diff --git a/src/mapi/glapi/gen/ARB_tessellation_shader.xml b/src/mesa/glapi/glapi/gen/ARB_tessellation_shader.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_tessellation_shader.xml rename to src/mesa/glapi/glapi/gen/ARB_tessellation_shader.xml diff --git a/src/mapi/glapi/gen/ARB_texture_barrier.xml b/src/mesa/glapi/glapi/gen/ARB_texture_barrier.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_barrier.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_barrier.xml diff --git a/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/src/mesa/glapi/glapi/gen/ARB_texture_buffer_object.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_buffer_object.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_buffer_object.xml diff --git a/src/mapi/glapi/gen/ARB_texture_buffer_range.xml b/src/mesa/glapi/glapi/gen/ARB_texture_buffer_range.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_buffer_range.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_buffer_range.xml diff --git a/src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml b/src/mesa/glapi/glapi/gen/ARB_texture_compression_rgtc.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_compression_rgtc.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_compression_rgtc.xml diff --git a/src/mapi/glapi/gen/ARB_texture_cube_map_array.xml b/src/mesa/glapi/glapi/gen/ARB_texture_cube_map_array.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_cube_map_array.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_cube_map_array.xml diff --git a/src/mapi/glapi/gen/ARB_texture_float.xml b/src/mesa/glapi/glapi/gen/ARB_texture_float.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_float.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_float.xml diff --git a/src/mapi/glapi/gen/ARB_texture_gather.xml b/src/mesa/glapi/glapi/gen/ARB_texture_gather.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_gather.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_gather.xml diff --git a/src/mapi/glapi/gen/ARB_texture_multisample.xml b/src/mesa/glapi/glapi/gen/ARB_texture_multisample.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_multisample.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_multisample.xml diff --git a/src/mapi/glapi/gen/ARB_texture_rg.xml b/src/mesa/glapi/glapi/gen/ARB_texture_rg.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_rg.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_rg.xml diff --git a/src/mapi/glapi/gen/ARB_texture_rgb10_a2ui.xml b/src/mesa/glapi/glapi/gen/ARB_texture_rgb10_a2ui.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_rgb10_a2ui.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_rgb10_a2ui.xml diff --git a/src/mapi/glapi/gen/ARB_texture_storage.xml b/src/mesa/glapi/glapi/gen/ARB_texture_storage.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_storage.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_storage.xml diff --git a/src/mapi/glapi/gen/ARB_texture_storage_multisample.xml b/src/mesa/glapi/glapi/gen/ARB_texture_storage_multisample.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_storage_multisample.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_storage_multisample.xml diff --git a/src/mapi/glapi/gen/ARB_texture_view.xml b/src/mesa/glapi/glapi/gen/ARB_texture_view.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_texture_view.xml rename to src/mesa/glapi/glapi/gen/ARB_texture_view.xml diff --git a/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/src/mesa/glapi/glapi/gen/ARB_uniform_buffer_object.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_uniform_buffer_object.xml rename to src/mesa/glapi/glapi/gen/ARB_uniform_buffer_object.xml diff --git a/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/src/mesa/glapi/glapi/gen/ARB_vertex_array_object.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_vertex_array_object.xml rename to src/mesa/glapi/glapi/gen/ARB_vertex_array_object.xml diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml b/src/mesa/glapi/glapi/gen/ARB_vertex_attrib_64bit.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml rename to src/mesa/glapi/glapi/gen/ARB_vertex_attrib_64bit.xml diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml b/src/mesa/glapi/glapi/gen/ARB_vertex_attrib_binding.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml rename to src/mesa/glapi/glapi/gen/ARB_vertex_attrib_binding.xml diff --git a/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml b/src/mesa/glapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml rename to src/mesa/glapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml diff --git a/src/mapi/glapi/gen/ARB_viewport_array.xml b/src/mesa/glapi/glapi/gen/ARB_viewport_array.xml similarity index 100% rename from src/mapi/glapi/gen/ARB_viewport_array.xml rename to src/mesa/glapi/glapi/gen/ARB_viewport_array.xml diff --git a/src/mapi/glapi/gen/EXT_EGL_image_storage.xml b/src/mesa/glapi/glapi/gen/EXT_EGL_image_storage.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_EGL_image_storage.xml rename to src/mesa/glapi/glapi/gen/EXT_EGL_image_storage.xml diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml b/src/mesa/glapi/glapi/gen/EXT_direct_state_access.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_direct_state_access.xml rename to src/mesa/glapi/glapi/gen/EXT_direct_state_access.xml diff --git a/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/src/mesa/glapi/glapi/gen/EXT_draw_buffers2.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_draw_buffers2.xml rename to src/mesa/glapi/glapi/gen/EXT_draw_buffers2.xml diff --git a/src/mapi/glapi/gen/EXT_external_objects.xml b/src/mesa/glapi/glapi/gen/EXT_external_objects.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_external_objects.xml rename to src/mesa/glapi/glapi/gen/EXT_external_objects.xml diff --git a/src/mapi/glapi/gen/EXT_external_objects_fd.xml b/src/mesa/glapi/glapi/gen/EXT_external_objects_fd.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_external_objects_fd.xml rename to src/mesa/glapi/glapi/gen/EXT_external_objects_fd.xml diff --git a/src/mapi/glapi/gen/EXT_external_objects_win32.xml b/src/mesa/glapi/glapi/gen/EXT_external_objects_win32.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_external_objects_win32.xml rename to src/mesa/glapi/glapi/gen/EXT_external_objects_win32.xml diff --git a/src/mapi/glapi/gen/EXT_framebuffer_object.xml b/src/mesa/glapi/glapi/gen/EXT_framebuffer_object.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_framebuffer_object.xml rename to src/mesa/glapi/glapi/gen/EXT_framebuffer_object.xml diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mesa/glapi/glapi/gen/EXT_gpu_shader4.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_gpu_shader4.xml rename to src/mesa/glapi/glapi/gen/EXT_gpu_shader4.xml diff --git a/src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml b/src/mesa/glapi/glapi/gen/EXT_multisampled_render_to_texture.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_multisampled_render_to_texture.xml rename to src/mesa/glapi/glapi/gen/EXT_multisampled_render_to_texture.xml diff --git a/src/mapi/glapi/gen/EXT_packed_depth_stencil.xml b/src/mesa/glapi/glapi/gen/EXT_packed_depth_stencil.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_packed_depth_stencil.xml rename to src/mesa/glapi/glapi/gen/EXT_packed_depth_stencil.xml diff --git a/src/mapi/glapi/gen/EXT_provoking_vertex.xml b/src/mesa/glapi/glapi/gen/EXT_provoking_vertex.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_provoking_vertex.xml rename to src/mesa/glapi/glapi/gen/EXT_provoking_vertex.xml diff --git a/src/mapi/glapi/gen/EXT_separate_shader_objects.xml b/src/mesa/glapi/glapi/gen/EXT_separate_shader_objects.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_separate_shader_objects.xml rename to src/mesa/glapi/glapi/gen/EXT_separate_shader_objects.xml diff --git a/src/mapi/glapi/gen/EXT_shader_image_load_store.xml b/src/mesa/glapi/glapi/gen/EXT_shader_image_load_store.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_shader_image_load_store.xml rename to src/mesa/glapi/glapi/gen/EXT_shader_image_load_store.xml diff --git a/src/mapi/glapi/gen/EXT_texture_array.xml b/src/mesa/glapi/glapi/gen/EXT_texture_array.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_texture_array.xml rename to src/mesa/glapi/glapi/gen/EXT_texture_array.xml diff --git a/src/mapi/glapi/gen/EXT_texture_integer.xml b/src/mesa/glapi/glapi/gen/EXT_texture_integer.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_texture_integer.xml rename to src/mesa/glapi/glapi/gen/EXT_texture_integer.xml diff --git a/src/mapi/glapi/gen/EXT_texture_storage.xml b/src/mesa/glapi/glapi/gen/EXT_texture_storage.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_texture_storage.xml rename to src/mesa/glapi/glapi/gen/EXT_texture_storage.xml diff --git a/src/mapi/glapi/gen/EXT_texture_storage_compression.xml b/src/mesa/glapi/glapi/gen/EXT_texture_storage_compression.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_texture_storage_compression.xml rename to src/mesa/glapi/glapi/gen/EXT_texture_storage_compression.xml diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mesa/glapi/glapi/gen/EXT_transform_feedback.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_transform_feedback.xml rename to src/mesa/glapi/glapi/gen/EXT_transform_feedback.xml diff --git a/src/mapi/glapi/gen/EXT_vertex_attrib_64bit.xml b/src/mesa/glapi/glapi/gen/EXT_vertex_attrib_64bit.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_vertex_attrib_64bit.xml rename to src/mesa/glapi/glapi/gen/EXT_vertex_attrib_64bit.xml diff --git a/src/mapi/glapi/gen/EXT_window_rectangles.xml b/src/mesa/glapi/glapi/gen/EXT_window_rectangles.xml similarity index 100% rename from src/mapi/glapi/gen/EXT_window_rectangles.xml rename to src/mesa/glapi/glapi/gen/EXT_window_rectangles.xml diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mesa/glapi/glapi/gen/GL3x.xml similarity index 100% rename from src/mapi/glapi/gen/GL3x.xml rename to src/mesa/glapi/glapi/gen/GL3x.xml diff --git a/src/mapi/glapi/gen/GL4x.xml b/src/mesa/glapi/glapi/gen/GL4x.xml similarity index 100% rename from src/mapi/glapi/gen/GL4x.xml rename to src/mesa/glapi/glapi/gen/GL4x.xml diff --git a/src/mapi/glapi/gen/GREMEDY_string_marker.xml b/src/mesa/glapi/glapi/gen/GREMEDY_string_marker.xml similarity index 100% rename from src/mapi/glapi/gen/GREMEDY_string_marker.xml rename to src/mesa/glapi/glapi/gen/GREMEDY_string_marker.xml diff --git a/src/mapi/glapi/gen/INTEL_performance_query.xml b/src/mesa/glapi/glapi/gen/INTEL_performance_query.xml similarity index 100% rename from src/mapi/glapi/gen/INTEL_performance_query.xml rename to src/mesa/glapi/glapi/gen/INTEL_performance_query.xml diff --git a/src/mapi/glapi/gen/KHR_context_flush_control.xml b/src/mesa/glapi/glapi/gen/KHR_context_flush_control.xml similarity index 100% rename from src/mapi/glapi/gen/KHR_context_flush_control.xml rename to src/mesa/glapi/glapi/gen/KHR_context_flush_control.xml diff --git a/src/mapi/glapi/gen/KHR_debug.xml b/src/mesa/glapi/glapi/gen/KHR_debug.xml similarity index 100% rename from src/mapi/glapi/gen/KHR_debug.xml rename to src/mesa/glapi/glapi/gen/KHR_debug.xml diff --git a/src/mapi/glapi/gen/KHR_robustness.xml b/src/mesa/glapi/glapi/gen/KHR_robustness.xml similarity index 100% rename from src/mapi/glapi/gen/KHR_robustness.xml rename to src/mesa/glapi/glapi/gen/KHR_robustness.xml diff --git a/src/mapi/glapi/gen/KHR_robustness_es.xml b/src/mesa/glapi/glapi/gen/KHR_robustness_es.xml similarity index 100% rename from src/mapi/glapi/gen/KHR_robustness_es.xml rename to src/mesa/glapi/glapi/gen/KHR_robustness_es.xml diff --git a/src/mapi/glapi/gen/KHR_shader_subgroup.xml b/src/mesa/glapi/glapi/gen/KHR_shader_subgroup.xml similarity index 100% rename from src/mapi/glapi/gen/KHR_shader_subgroup.xml rename to src/mesa/glapi/glapi/gen/KHR_shader_subgroup.xml diff --git a/src/mapi/glapi/gen/KHR_texture_compression_astc.xml b/src/mesa/glapi/glapi/gen/KHR_texture_compression_astc.xml similarity index 100% rename from src/mapi/glapi/gen/KHR_texture_compression_astc.xml rename to src/mesa/glapi/glapi/gen/KHR_texture_compression_astc.xml diff --git a/src/mapi/glapi/gen/MESA_tile_raster_order.xml b/src/mesa/glapi/glapi/gen/MESA_tile_raster_order.xml similarity index 100% rename from src/mapi/glapi/gen/MESA_tile_raster_order.xml rename to src/mesa/glapi/glapi/gen/MESA_tile_raster_order.xml diff --git a/src/mapi/glapi/gen/NV_alpha_to_coverage_dither_control.xml b/src/mesa/glapi/glapi/gen/NV_alpha_to_coverage_dither_control.xml similarity index 100% rename from src/mapi/glapi/gen/NV_alpha_to_coverage_dither_control.xml rename to src/mesa/glapi/glapi/gen/NV_alpha_to_coverage_dither_control.xml diff --git a/src/mapi/glapi/gen/NV_conditional_render.xml b/src/mesa/glapi/glapi/gen/NV_conditional_render.xml similarity index 100% rename from src/mapi/glapi/gen/NV_conditional_render.xml rename to src/mesa/glapi/glapi/gen/NV_conditional_render.xml diff --git a/src/mapi/glapi/gen/NV_copy_image.xml b/src/mesa/glapi/glapi/gen/NV_copy_image.xml similarity index 100% rename from src/mapi/glapi/gen/NV_copy_image.xml rename to src/mesa/glapi/glapi/gen/NV_copy_image.xml diff --git a/src/mapi/glapi/gen/NV_half_float.xml b/src/mesa/glapi/glapi/gen/NV_half_float.xml similarity index 100% rename from src/mapi/glapi/gen/NV_half_float.xml rename to src/mesa/glapi/glapi/gen/NV_half_float.xml diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mesa/glapi/glapi/gen/NV_primitive_restart.xml similarity index 100% rename from src/mapi/glapi/gen/NV_primitive_restart.xml rename to src/mesa/glapi/glapi/gen/NV_primitive_restart.xml diff --git a/src/mapi/glapi/gen/NV_texture_barrier.xml b/src/mesa/glapi/glapi/gen/NV_texture_barrier.xml similarity index 100% rename from src/mapi/glapi/gen/NV_texture_barrier.xml rename to src/mesa/glapi/glapi/gen/NV_texture_barrier.xml diff --git a/src/mapi/glapi/gen/NV_timeline_semaphore.xml b/src/mesa/glapi/glapi/gen/NV_timeline_semaphore.xml similarity index 100% rename from src/mapi/glapi/gen/NV_timeline_semaphore.xml rename to src/mesa/glapi/glapi/gen/NV_timeline_semaphore.xml diff --git a/src/mapi/glapi/gen/NV_vdpau_interop.xml b/src/mesa/glapi/glapi/gen/NV_vdpau_interop.xml similarity index 100% rename from src/mapi/glapi/gen/NV_vdpau_interop.xml rename to src/mesa/glapi/glapi/gen/NV_vdpau_interop.xml diff --git a/src/mapi/glapi/gen/NV_viewport_swizzle.xml b/src/mesa/glapi/glapi/gen/NV_viewport_swizzle.xml similarity index 100% rename from src/mapi/glapi/gen/NV_viewport_swizzle.xml rename to src/mesa/glapi/glapi/gen/NV_viewport_swizzle.xml diff --git a/src/mapi/glapi/gen/OES_EGL_image.xml b/src/mesa/glapi/glapi/gen/OES_EGL_image.xml similarity index 100% rename from src/mapi/glapi/gen/OES_EGL_image.xml rename to src/mesa/glapi/glapi/gen/OES_EGL_image.xml diff --git a/src/mapi/glapi/gen/OES_fixed_point.xml b/src/mesa/glapi/glapi/gen/OES_fixed_point.xml similarity index 100% rename from src/mapi/glapi/gen/OES_fixed_point.xml rename to src/mesa/glapi/glapi/gen/OES_fixed_point.xml diff --git a/src/mapi/glapi/gen/OES_single_precision.xml b/src/mesa/glapi/glapi/gen/OES_single_precision.xml similarity index 100% rename from src/mapi/glapi/gen/OES_single_precision.xml rename to src/mesa/glapi/glapi/gen/OES_single_precision.xml diff --git a/src/mapi/glapi/gen/OES_texture_compression_astc.xml b/src/mesa/glapi/glapi/gen/OES_texture_compression_astc.xml similarity index 100% rename from src/mapi/glapi/gen/OES_texture_compression_astc.xml rename to src/mesa/glapi/glapi/gen/OES_texture_compression_astc.xml diff --git a/src/mapi/glapi/gen/OVR_multiview.xml b/src/mesa/glapi/glapi/gen/OVR_multiview.xml similarity index 100% rename from src/mapi/glapi/gen/OVR_multiview.xml rename to src/mesa/glapi/glapi/gen/OVR_multiview.xml diff --git a/src/mapi/glapi/gen/OVR_multiview_multisampled_render_to_texture.xml b/src/mesa/glapi/glapi/gen/OVR_multiview_multisampled_render_to_texture.xml similarity index 100% rename from src/mapi/glapi/gen/OVR_multiview_multisampled_render_to_texture.xml rename to src/mesa/glapi/glapi/gen/OVR_multiview_multisampled_render_to_texture.xml diff --git a/src/mapi/glapi/gen/api_beginend_init_h.py b/src/mesa/glapi/glapi/gen/api_beginend_init_h.py similarity index 100% rename from src/mapi/glapi/gen/api_beginend_init_h.py rename to src/mesa/glapi/glapi/gen/api_beginend_init_h.py diff --git a/src/mapi/glapi/gen/api_exec_decl_h.py b/src/mesa/glapi/glapi/gen/api_exec_decl_h.py similarity index 100% rename from src/mapi/glapi/gen/api_exec_decl_h.py rename to src/mesa/glapi/glapi/gen/api_exec_decl_h.py diff --git a/src/mapi/glapi/gen/api_exec_init.py b/src/mesa/glapi/glapi/gen/api_exec_init.py similarity index 99% rename from src/mapi/glapi/gen/api_exec_init.py rename to src/mesa/glapi/glapi/gen/api_exec_init.py index 3372cf37eb0..249736600c1 100644 --- a/src/mapi/glapi/gen/api_exec_init.py +++ b/src/mesa/glapi/glapi/gen/api_exec_init.py @@ -47,7 +47,7 @@ header = r"""/** #include "api_exec_decl.h" -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" #include "main/context.h" #include "dispatch.h" diff --git a/src/mapi/glapi/gen/api_hw_select_init_h.py b/src/mesa/glapi/glapi/gen/api_hw_select_init_h.py similarity index 100% rename from src/mapi/glapi/gen/api_hw_select_init_h.py rename to src/mesa/glapi/glapi/gen/api_hw_select_init_h.py diff --git a/src/mapi/glapi/gen/api_save_h.py b/src/mesa/glapi/glapi/gen/api_save_h.py similarity index 100% rename from src/mapi/glapi/gen/api_save_h.py rename to src/mesa/glapi/glapi/gen/api_save_h.py diff --git a/src/mapi/glapi/gen/api_save_init_h.py b/src/mesa/glapi/glapi/gen/api_save_init_h.py similarity index 100% rename from src/mapi/glapi/gen/api_save_init_h.py rename to src/mesa/glapi/glapi/gen/api_save_init_h.py diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mesa/glapi/glapi/gen/apiexec.py similarity index 100% rename from src/mapi/glapi/gen/apiexec.py rename to src/mesa/glapi/glapi/gen/apiexec.py diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mesa/glapi/glapi/gen/es_EXT.xml similarity index 100% rename from src/mapi/glapi/gen/es_EXT.xml rename to src/mesa/glapi/glapi/gen/es_EXT.xml diff --git a/src/mapi/glapi/gen/glX_API.xml b/src/mesa/glapi/glapi/gen/glX_API.xml similarity index 100% rename from src/mapi/glapi/gen/glX_API.xml rename to src/mesa/glapi/glapi/gen/glX_API.xml diff --git a/src/mapi/glapi/gen/glX_XML.py b/src/mesa/glapi/glapi/gen/glX_XML.py similarity index 100% rename from src/mapi/glapi/gen/glX_XML.py rename to src/mesa/glapi/glapi/gen/glX_XML.py diff --git a/src/mapi/glapi/gen/glX_proto_common.py b/src/mesa/glapi/glapi/gen/glX_proto_common.py similarity index 100% rename from src/mapi/glapi/gen/glX_proto_common.py rename to src/mesa/glapi/glapi/gen/glX_proto_common.py diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mesa/glapi/glapi/gen/glX_proto_send.py similarity index 100% rename from src/mapi/glapi/gen/glX_proto_send.py rename to src/mesa/glapi/glapi/gen/glX_proto_send.py diff --git a/src/mapi/glapi/gen/glX_proto_size.py b/src/mesa/glapi/glapi/gen/glX_proto_size.py similarity index 100% rename from src/mapi/glapi/gen/glX_proto_size.py rename to src/mesa/glapi/glapi/gen/glX_proto_size.py diff --git a/src/mapi/glapi/gen/gl_API.dtd b/src/mesa/glapi/glapi/gen/gl_API.dtd similarity index 100% rename from src/mapi/glapi/gen/gl_API.dtd rename to src/mesa/glapi/glapi/gen/gl_API.dtd diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mesa/glapi/glapi/gen/gl_API.xml similarity index 100% rename from src/mapi/glapi/gen/gl_API.xml rename to src/mesa/glapi/glapi/gen/gl_API.xml diff --git a/src/mapi/glapi/gen/gl_XML.py b/src/mesa/glapi/glapi/gen/gl_XML.py similarity index 100% rename from src/mapi/glapi/gen/gl_XML.py rename to src/mesa/glapi/glapi/gen/gl_XML.py diff --git a/src/mapi/glapi/gen/gl_and_es_API.xml b/src/mesa/glapi/glapi/gen/gl_and_es_API.xml similarity index 100% rename from src/mapi/glapi/gen/gl_and_es_API.xml rename to src/mesa/glapi/glapi/gen/gl_and_es_API.xml diff --git a/src/mapi/glapi/gen/gl_and_glX_API.xml b/src/mesa/glapi/glapi/gen/gl_and_glX_API.xml similarity index 100% rename from src/mapi/glapi/gen/gl_and_glX_API.xml rename to src/mesa/glapi/glapi/gen/gl_and_glX_API.xml diff --git a/src/mapi/glapi/gen/gl_enums.py b/src/mesa/glapi/glapi/gen/gl_enums.py similarity index 100% rename from src/mapi/glapi/gen/gl_enums.py rename to src/mesa/glapi/glapi/gen/gl_enums.py diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mesa/glapi/glapi/gen/gl_gentable.py similarity index 100% rename from src/mapi/glapi/gen/gl_gentable.py rename to src/mesa/glapi/glapi/gen/gl_gentable.py diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mesa/glapi/glapi/gen/gl_table.py similarity index 100% rename from src/mapi/glapi/gen/gl_table.py rename to src/mesa/glapi/glapi/gen/gl_table.py diff --git a/src/mapi/glapi/gen/license.py b/src/mesa/glapi/glapi/gen/license.py similarity index 100% rename from src/mapi/glapi/gen/license.py rename to src/mesa/glapi/glapi/gen/license.py diff --git a/src/mapi/glapi/gen/marshal_XML.py b/src/mesa/glapi/glapi/gen/marshal_XML.py similarity index 100% rename from src/mapi/glapi/gen/marshal_XML.py rename to src/mesa/glapi/glapi/gen/marshal_XML.py diff --git a/src/mapi/glapi/gen/marshal_generated_c.py b/src/mesa/glapi/glapi/gen/marshal_generated_c.py similarity index 100% rename from src/mapi/glapi/gen/marshal_generated_c.py rename to src/mesa/glapi/glapi/gen/marshal_generated_c.py diff --git a/src/mapi/glapi/gen/marshal_generated_h.py b/src/mesa/glapi/glapi/gen/marshal_generated_h.py similarity index 100% rename from src/mapi/glapi/gen/marshal_generated_h.py rename to src/mesa/glapi/glapi/gen/marshal_generated_h.py diff --git a/src/mapi/glapi/gen/meson.build b/src/mesa/glapi/glapi/gen/meson.build similarity index 100% rename from src/mapi/glapi/gen/meson.build rename to src/mesa/glapi/glapi/gen/meson.build diff --git a/src/mapi/glapi/gen/static_data.py b/src/mesa/glapi/glapi/gen/static_data.py similarity index 99% rename from src/mapi/glapi/gen/static_data.py rename to src/mesa/glapi/glapi/gen/static_data.py index ab06bddd509..179d238da65 100644 --- a/src/mapi/glapi/gen/static_data.py +++ b/src/mesa/glapi/glapi/gen/static_data.py @@ -1687,7 +1687,7 @@ function_count = i # Exported from libGL.so libgl_public_functions = set() with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), - '..', '..', '..', 'glx', 'libgl-symbols.txt'), 'r') as f: + '..', '..', '..', '..', 'glx', 'libgl-symbols.txt'), 'r') as f: for line in f: if len(line) > 3 and line[0:2] == 'gl' and line[2] != 'X': libgl_public_functions.add(line[2:].rstrip()) diff --git a/src/mapi/glapi/gen/typeexpr.py b/src/mesa/glapi/glapi/gen/typeexpr.py similarity index 100% rename from src/mapi/glapi/gen/typeexpr.py rename to src/mesa/glapi/glapi/gen/typeexpr.py diff --git a/src/mapi/glapi/gen/unmarshal_table_c.py b/src/mesa/glapi/glapi/gen/unmarshal_table_c.py similarity index 100% rename from src/mapi/glapi/gen/unmarshal_table_c.py rename to src/mesa/glapi/glapi/gen/unmarshal_table_c.py diff --git a/src/mapi/glapi/glapi.h b/src/mesa/glapi/glapi/glapi.h similarity index 100% rename from src/mapi/glapi/glapi.h rename to src/mesa/glapi/glapi/glapi.h diff --git a/src/mapi/glapi/libgl_public.c b/src/mesa/glapi/glapi/libgl_public.c similarity index 96% rename from src/mapi/glapi/libgl_public.c rename to src/mesa/glapi/glapi/libgl_public.c index 8ff83c389ba..6d3737f7400 100644 --- a/src/mapi/glapi/libgl_public.c +++ b/src/mesa/glapi/glapi/libgl_public.c @@ -5,7 +5,7 @@ * Chia-I Wu */ -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" /* REALLY_INITIAL_EXEC implies __GLIBC__ */ #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC) diff --git a/src/mapi/glapi/meson.build b/src/mesa/glapi/glapi/meson.build similarity index 100% rename from src/mapi/glapi/meson.build rename to src/mesa/glapi/glapi/meson.build diff --git a/src/mapi/glapi/registry/gl.xml b/src/mesa/glapi/glapi/registry/gl.xml similarity index 100% rename from src/mapi/glapi/registry/gl.xml rename to src/mesa/glapi/glapi/registry/gl.xml diff --git a/src/mapi/mapi_abi.py b/src/mesa/glapi/mapi_abi.py similarity index 100% rename from src/mapi/mapi_abi.py rename to src/mesa/glapi/mapi_abi.py diff --git a/src/mapi/meson.build b/src/mesa/glapi/meson.build similarity index 99% rename from src/mapi/meson.build rename to src/mesa/glapi/meson.build index 1f32eaea5c6..7b7e9d6eb78 100644 --- a/src/mapi/meson.build +++ b/src/mesa/glapi/meson.build @@ -144,7 +144,7 @@ glapi_xml_py_deps = files( 'new/genCommon.py', # Symbols - '../glx/libgl-symbols.txt', + '../../glx/libgl-symbols.txt', ) subdir('glapi') diff --git a/src/mapi/new/genCommon.py b/src/mesa/glapi/new/genCommon.py similarity index 100% rename from src/mapi/new/genCommon.py rename to src/mesa/glapi/new/genCommon.py diff --git a/src/mapi/new/gen_gldispatch_mapi.py b/src/mesa/glapi/new/gen_gldispatch_mapi.py similarity index 100% rename from src/mapi/new/gen_gldispatch_mapi.py rename to src/mesa/glapi/new/gen_gldispatch_mapi.py diff --git a/src/mapi/shared-glapi/core.c b/src/mesa/glapi/shared-glapi/core.c similarity index 100% rename from src/mapi/shared-glapi/core.c rename to src/mesa/glapi/shared-glapi/core.c diff --git a/src/mapi/shared-glapi/meson.build b/src/mesa/glapi/shared-glapi/meson.build similarity index 100% rename from src/mapi/shared-glapi/meson.build rename to src/mesa/glapi/shared-glapi/meson.build diff --git a/src/mesa/main/get_hash_generator.py b/src/mesa/main/get_hash_generator.py index fb006ad82d6..3361d70bf68 100644 --- a/src/mesa/main/get_hash_generator.py +++ b/src/mesa/main/get_hash_generator.py @@ -34,7 +34,7 @@ import get_hash_params param_desc_file = os.path.join(os.path.dirname(__file__), "get_hash_params.py") -GLAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mapi", "glapi", "gen") +GLAPI = os.path.join(os.path.dirname(__file__), "..", "glapi", "glapi", "gen") sys.path.insert(0, GLAPI) import gl_XML diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 6e28cfc5b13..baa2f8de7ab 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -1,6 +1,7 @@ # Copyright © 2017 Intel Corporation # SPDX-License-Identifier: MIT +subdir('glapi') subdir('program') if _shader_replacement != '' @@ -400,7 +401,7 @@ format_fallback_c = custom_target( get_hash_h = custom_target( 'get_hash.h', - input : ['main/get_hash_generator.py', '../mapi/glapi/gen/gl_and_es_API.xml'], + input : ['main/get_hash_generator.py', 'glapi/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') + glapi_xml_py_deps, diff --git a/src/meson.build b/src/meson.build index 70bf4952db6..6d6adc69966 100644 --- a/src/meson.build +++ b/src/meson.build @@ -7,7 +7,7 @@ subdir('android_stub') subdir('util') inc_mesa = include_directories('mesa') -inc_mapi = include_directories('mapi') +inc_mapi = include_directories('mesa/glapi') inc_src = include_directories('.') inc_gallium = include_directories('gallium/include') inc_gallium_aux = include_directories('gallium/auxiliary') @@ -53,9 +53,6 @@ endif if with_gallium_or_lvp or with_gbm or with_platform_wayland subdir('loader') endif -if with_gallium - subdir('mapi') -endif subdir('compiler') if with_tools.contains('drm-shim') subdir('drm-shim') @@ -124,10 +121,10 @@ endif # These require libgallium (shared_glapi_lib) if with_gallium and (with_glx != 'disabled' or with_egl) if with_gles1 and not with_glvnd - subdir('mapi/es1api') + subdir('mesa/glapi/es1api') endif if with_gles2 and not with_glvnd - subdir('mapi/es2api') + subdir('mesa/glapi/es2api') endif if with_tests subdir('mesa/main/tests')