From ebdecb8d45f7b108a2d025133ba655643a454158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 4 Aug 2025 15:56:38 -0400 Subject: [PATCH] mesa: remove inc_mapi We don't need this to be in include dirs. Acked-by: Alyssa Rosenzweig Part-of: --- src/compiler/glsl/glcpp/meson.build | 6 +++--- src/compiler/glsl/meson.build | 8 ++++---- src/compiler/glsl/tests/meson.build | 4 ++-- src/compiler/spirv/meson.build | 2 +- src/egl/meson.build | 4 ++-- src/gallium/auxiliary/meson.build | 2 +- src/gallium/drivers/crocus/meson.build | 4 ++-- src/gallium/drivers/freedreno/meson.build | 2 +- src/gallium/drivers/iris/meson.build | 4 ++-- src/gallium/drivers/lima/meson.build | 2 +- src/gallium/drivers/nouveau/codegen/meson.build | 2 +- src/gallium/drivers/nouveau/meson.build | 2 +- src/gallium/drivers/panfrost/meson.build | 1 - src/gallium/drivers/r600/meson.build | 2 +- src/gallium/drivers/r600/sfn/tests/meson.build | 4 ++-- src/gallium/drivers/virgl/meson.build | 2 +- src/gallium/drivers/virgl/tests/meson.build | 2 +- src/gallium/drivers/zink/meson.build | 2 +- src/gallium/frontends/dri/meson.build | 2 +- src/gallium/frontends/glx/xlib/meson.build | 2 +- src/gallium/frontends/hgl/meson.build | 2 +- src/gallium/frontends/va/meson.build | 2 +- src/gallium/frontends/wgl/meson.build | 2 +- src/gallium/targets/dri/meson.build | 2 +- src/gallium/targets/dril/meson.build | 2 +- src/gallium/targets/libgl-xlib/meson.build | 2 +- src/gallium/targets/mediafoundation/meson.build | 2 +- src/gallium/targets/va/meson.build | 4 ++-- src/gallium/targets/vdpau/meson.build | 2 +- src/gallium/targets/wgl/meson.build | 2 +- src/gallium/winsys/sw/xlib/meson.build | 2 +- src/gallium/winsys/virgl/common/meson.build | 2 +- src/gallium/winsys/virgl/drm/meson.build | 2 +- src/gallium/winsys/virgl/vtest/meson.build | 2 +- src/mesa/glapi/es1api/libgles1_public.c | 6 +++--- src/mesa/glapi/es1api/meson.build | 2 +- src/mesa/glapi/es2api/libgles2_public.c | 6 +++--- src/mesa/glapi/es2api/meson.build | 2 +- src/mesa/glapi/glapi/libgl_public.c | 6 +++--- src/mesa/glapi/glapi/meson.build | 2 +- src/mesa/glapi/shared-glapi/core.c | 8 ++++---- src/mesa/glapi/shared-glapi/meson.build | 2 +- src/mesa/main/mtypes.h | 2 +- src/mesa/main/tests/meson.build | 2 +- src/mesa/meson.build | 4 ++-- src/mesa/state_tracker/st_context.c | 2 +- src/mesa/state_tracker/tests/meson.build | 2 +- src/mesa/vbo/vbo_save_loopback.c | 2 +- src/meson.build | 1 - src/nouveau/compiler/meson.build | 2 +- 50 files changed, 69 insertions(+), 71 deletions(-) diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 59b078aa616..1ec26cb1a7b 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -32,7 +32,7 @@ libglcpp = static_library( 'glcpp', [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')], dependencies : idep_mesautil, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], c_args : [no_override_init_args, c_msvc_compat_args], cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden', @@ -44,7 +44,7 @@ libglcpp_standalone = static_library( 'pp_standalone_scaffolding.c', link_with : libglcpp, dependencies : idep_mesautil, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], c_args : [no_override_init_args, c_msvc_compat_args], cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden', @@ -55,7 +55,7 @@ glcpp = executable( 'glcpp', 'glcpp.c', dependencies : [dep_m, idep_getopt, idep_mesautil], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libglcpp_standalone, libglsl_util], c_args : [no_override_init_args, c_msvc_compat_args], gnu_symbol_visibility : 'hidden', diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index 1b9a48ee333..d2fa8b1810f 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -4,7 +4,7 @@ libglsl_util = static_library( 'glsl_util', glsl_util_files, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_valgrind, idep_mesautil], gnu_symbol_visibility : 'hidden', build_by_default : false, @@ -213,7 +213,7 @@ libglsl = static_library( cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden', link_with : libglcpp, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [idep_nir, idep_mesautil], build_by_default : false, ) @@ -229,7 +229,7 @@ libglsl_standalone = static_library( c_args : [c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libglsl, libglsl_util, libglcpp_standalone], dependencies : [idep_mesautil, idep_getopt, idep_compiler, idep_nir], build_by_default : false, @@ -242,7 +242,7 @@ glsl_compiler = executable( cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_clock, dep_thread, idep_getopt, idep_mesautil], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libglsl_standalone], build_by_default : with_tools.contains('glsl'), install : with_tools.contains('glsl'), diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build index 895309829ed..517ac4db4a2 100644 --- a/src/compiler/glsl/tests/meson.build +++ b/src/compiler/glsl/tests/meson.build @@ -18,7 +18,7 @@ test( general_ir_test_files, cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl], link_with : [libglsl, libglsl_standalone, libglsl_util], dependencies : [dep_clock, dep_thread, idep_gtest, idep_mesautil, idep_nir], ), @@ -33,7 +33,7 @@ test( ['sampler_types_test.cpp', ir_expression_operation_h], cpp_args : [cpp_msvc_compat_args], gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl], link_with : [libglsl, libglsl_util], dependencies : [dep_thread, idep_gtest, idep_mesautil, idep_compiler], ), diff --git a/src/compiler/spirv/meson.build b/src/compiler/spirv/meson.build index eb3315170c4..4971f1cc73e 100644 --- a/src/compiler/spirv/meson.build +++ b/src/compiler/spirv/meson.build @@ -52,7 +52,7 @@ libvtn = static_library( vtn_gather_types_c, vtn_generator_ids_h, ], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa], + include_directories : [inc_include, inc_src, inc_mesa], c_args : [c_msvc_compat_args, no_override_init_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_spirv_tools, idep_nir, dep_valgrind], diff --git a/src/egl/meson.build b/src/egl/meson.build index 66bb48de2f6..920100d85ac 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -143,7 +143,7 @@ elif with_platform_haiku files_egl += files('drivers/haiku/egl_haiku.cpp') incs_for_egl += [inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium_winsys, inc_gallium_winsys_sw] - incs_for_egl += [inc_mesa, inc_mapi] + incs_for_egl += [inc_mesa] incs_for_egl += [include_directories('../gallium/frontends/hgl')] link_for_egl += [libmesa, libgallium, libswhgl, libsthgl] @@ -154,7 +154,7 @@ elif with_platform_windows ] files_egl += files('drivers/wgl/egl_wgl.c') files_egl += main_dispatch_h - incs_for_egl += [inc_wgl, inc_gallium, inc_gallium_aux, inc_mesa, inc_mapi] + incs_for_egl += [inc_wgl, inc_gallium, inc_gallium_aux, inc_mesa] link_for_egl += libgallium_wgl else diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 12249f42a3e..02d7623e241 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -529,7 +529,7 @@ if with_tests executable( 'gallium-aux', 'util/u_surface_test.cpp', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], link_with: libgallium, dependencies : [idep_gtest, idep_mesautil], ), diff --git a/src/gallium/drivers/crocus/meson.build b/src/gallium/drivers/crocus/meson.build index 02579a67d29..f6928fcfd99 100644 --- a/src/gallium/drivers/crocus/meson.build +++ b/src/gallium/drivers/crocus/meson.build @@ -41,7 +41,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80'] crocus_per_hw_ver_libs += static_library( 'crocus_per_hw_ver@0@'.format(v), ['crocus_blorp.c', 'crocus_query.c', 'crocus_state.c', 'crocus_blt.c', gen_xml_pack], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], c_args : [ no_override_init_args, sse2_args, '-DGFX_VERx10=@0@'.format(v), @@ -58,7 +58,7 @@ libcrocus = static_library( inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_intel, inc_gallium_drivers, # these should not be necessary, but main/macros.h... - inc_mesa, inc_mapi + inc_mesa ], c_args : [sse2_args], cpp_args : [sse2_args], diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index d0439e8f0fd..a48c51799a4 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -223,7 +223,7 @@ freedreno_tracepoints = custom_target( files_libfreedreno += freedreno_tracepoints freedreno_includes = [ - inc_mesa, inc_mapi, + inc_mesa, inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_freedreno, include_directories('ir3'), ] diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index 2a06461ec59..8f593caec58 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -62,7 +62,7 @@ foreach v : ['80', '90', '110', '120', '125', '200', '300'] iris_per_hw_ver_libs += static_library( 'iris_per_hw_ver@0@'.format(v), ['iris_blorp.c', 'iris_query.c', 'iris_state.c', 'iris_indirect_gen.c', gen_xml_pack], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], c_args : [ intel_common_args, no_override_init_args, sse2_args, @@ -82,7 +82,7 @@ libiris = static_library( inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_intel, inc_gallium_drivers, # these should not be necessary, but main/macros.h... - inc_mesa, inc_mapi + inc_mesa ], c_args : [intel_common_args, sse2_args], cpp_args : [intel_common_args, sse2_args], diff --git a/src/gallium/drivers/lima/meson.build b/src/gallium/drivers/lima/meson.build index 570d0ca5c61..fae99e65223 100644 --- a/src/gallium/drivers/lima/meson.build +++ b/src/gallium/drivers/lima/meson.build @@ -104,7 +104,7 @@ lima_disasm = executable( 'standalone/lima_disasm.c', ), include_directories : [ - inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_mesa, inc_mapi, + inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_mesa, ], dependencies : [ idep_mesautil, diff --git a/src/gallium/drivers/nouveau/codegen/meson.build b/src/gallium/drivers/nouveau/codegen/meson.build index 6eece3c5aa6..c52b4ac35b3 100644 --- a/src/gallium/drivers/nouveau/codegen/meson.build +++ b/src/gallium/drivers/nouveau/codegen/meson.build @@ -50,7 +50,7 @@ libnouveau_codegen = static_library( 'nouveau_codegen', files_libnouveau_codegen, include_directories : [ - inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa, + inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_mesa, ], gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, idep_mesautil, idep_nir_headers], diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build index 018130a63ac..769bb2dcd7d 100644 --- a/src/gallium/drivers/nouveau/meson.build +++ b/src/gallium/drivers/nouveau/meson.build @@ -167,7 +167,7 @@ libnouveau = static_library( 'nouveau', [files_libnouveau, sha1_h], include_directories : [ - inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa, + inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_mesa, ], gnu_symbol_visibility : 'hidden', link_with : [libnouveauwinsys], diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index dd8ff95f982..0f54cce1a81 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -28,7 +28,6 @@ files_panfrost = files( ) panfrost_includes = [ - inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build index edffb45225e..e4ab7eded4f 100644 --- a/src/gallium/drivers/r600/meson.build +++ b/src/gallium/drivers/r600/meson.build @@ -159,7 +159,7 @@ libr600 = static_library( cpp_args: r600_cpp_args, gnu_symbol_visibility : 'hidden', include_directories : [ - inc_src, inc_mapi, inc_mesa, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, + inc_src, inc_mesa, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, inc_gallium_drivers, ], dependencies: [dep_llvm, idep_nir, idep_nir_headers, idep_mesautil], diff --git a/src/gallium/drivers/r600/sfn/tests/meson.build b/src/gallium/drivers/r600/sfn/tests/meson.build index e3b5f36dac6..e1fb7f4dbdf 100644 --- a/src/gallium/drivers/r600/sfn/tests/meson.build +++ b/src/gallium/drivers/r600/sfn/tests/meson.build @@ -1,7 +1,7 @@ r600_test_lib = static_library('r600_test', 'sfn_test_shaders.cpp', cpp_args: r600_cpp_args, - include_directories : [ inc_src, inc_mapi, inc_mesa, inc_include, + include_directories : [ inc_src, inc_mesa, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, inc_gallium_drivers, ], dependencies : [idep_gtest, dep_thread, dep_llvm, idep_nir, @@ -10,7 +10,7 @@ r600_test_lib = static_library('r600_test', 'sfn_test_shaders.cpp', ) r600_test_dep = declare_dependency( - include_directories : [ inc_src, inc_mapi, inc_mesa, inc_include, + include_directories : [ inc_src, inc_mesa, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, inc_gallium_drivers, ], link_with : [ libr600, libmesa, libgalliumvl, libgallium, libradeonwinsys, r600_test_lib], diff --git a/src/gallium/drivers/virgl/meson.build b/src/gallium/drivers/virgl/meson.build index 62a7ac29979..100a76a5475 100644 --- a/src/gallium/drivers/virgl/meson.build +++ b/src/gallium/drivers/virgl/meson.build @@ -20,7 +20,7 @@ libvirgl = static_library( 'virgl', [ files_libvirgl ], gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio], dependencies : [dep_libdrm, idep_mesautil, idep_xmlconfig, idep_nir], ) diff --git a/src/gallium/drivers/virgl/tests/meson.build b/src/gallium/drivers/virgl/tests/meson.build index 9f59703a1fd..4d16ee09c76 100644 --- a/src/gallium/drivers/virgl/tests/meson.build +++ b/src/gallium/drivers/virgl/tests/meson.build @@ -7,7 +7,7 @@ test( 'virgl_staging_mgr_test', files('virgl_staging_mgr_test.cpp'), dependencies : [dep_thread, idep_gtest, idep_mesautil, idep_nir_headers], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio, include_directories('..')], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio, include_directories('..')], link_with : [libvirgl, libgallium], ), suite : ['virgl'], diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build index dd11712908d..e9681f517fd 100644 --- a/src/gallium/drivers/zink/meson.build +++ b/src/gallium/drivers/zink/meson.build @@ -90,7 +90,7 @@ libzink = static_library( 'zink', [files_libzink, zink_device_info, zink_instance, zink_nir_algebraic_c, vk_dispatch_table, spirv_info_h], gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_util, inc_zink_vk], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_util, inc_zink_vk], link_args : [ld_args_build_id], dependencies: [ idep_nir_headers, idep_mesautil, idep_vulkan_util_headers, diff --git a/src/gallium/frontends/dri/meson.build b/src/gallium/frontends/dri/meson.build index a98c8c0a903..6d54daebae0 100644 --- a/src/gallium/frontends/dri/meson.build +++ b/src/gallium/frontends/dri/meson.build @@ -53,7 +53,7 @@ libdri = static_library( 'dri', [ files_libdri, sha1_h ], include_directories : [ - inc_include, inc_util, inc_mesa, inc_mapi, inc_src, inc_gallium, + inc_include, inc_util, inc_mesa, inc_src, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, inc_loader, ], c_args : [libdri_c_args], diff --git a/src/gallium/frontends/glx/xlib/meson.build b/src/gallium/frontends/glx/xlib/meson.build index 3625ee13c63..32594818e3a 100644 --- a/src/gallium/frontends/glx/xlib/meson.build +++ b/src/gallium/frontends/glx/xlib/meson.build @@ -5,6 +5,6 @@ libxlib = static_library( 'xlib', files('glx_api.c', 'glx_getproc.c', 'glx_usefont.c', 'xm_api.c', 'xm_st.c'), gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa], + include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mesa], dependencies : [dep_x11, dep_xext, dep_xcb, dep_glproto, idep_mesautil, idep_dispatch_h], ) diff --git a/src/gallium/frontends/hgl/meson.build b/src/gallium/frontends/hgl/meson.build index 418e71be6d2..03239740f13 100644 --- a/src/gallium/frontends/hgl/meson.build +++ b/src/gallium/frontends/hgl/meson.build @@ -10,7 +10,7 @@ libsthgl = static_library( 'sthgl', files_libsthgl, include_directories : [ - inc_include, inc_util, inc_mesa, inc_mapi, inc_src, + inc_include, inc_util, inc_mesa, inc_src, inc_gallium, inc_gallium_aux ], gnu_symbol_visibility : 'hidden', diff --git a/src/gallium/frontends/va/meson.build b/src/gallium/frontends/va/meson.build index c190bac2517..93af35ec937 100644 --- a/src/gallium/frontends/va/meson.build +++ b/src/gallium/frontends/va/meson.build @@ -18,7 +18,7 @@ libva_st = static_library( ), ], gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [ dep_va_headers, dep_x11_xcb, dep_xcb, dep_xcb_dri3, dep_libdrm, idep_mesautil, diff --git a/src/gallium/frontends/wgl/meson.build b/src/gallium/frontends/wgl/meson.build index 004e635fb71..5f25620c8f3 100644 --- a/src/gallium/frontends/wgl/meson.build +++ b/src/gallium/frontends/wgl/meson.build @@ -39,7 +39,7 @@ libwgl = static_library( '-D_GDI32_', # prevent wgl* being declared __declspec(dllimport) ], include_directories : [ - inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa, + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mesa, ], dependencies : _wgl_deps, ) diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 6d3ccafc63e..6a2c6e94b90 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -44,7 +44,7 @@ libgallium_dri = shared_library( libgallium_name, files('dri_target.c'), include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, inc_gallium_winsys, include_directories('../../frontends/dri'), ], gnu_symbol_visibility : 'hidden', diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build index 80cbef3f039..140022f077d 100644 --- a/src/gallium/targets/dril/meson.build +++ b/src/gallium/targets/dril/meson.build @@ -43,7 +43,7 @@ dril_dri = shared_library( 'dril_dri', files('dril_target.c'), include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers, inc_gallium_winsys, ], gnu_symbol_visibility : 'hidden', diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build index 646642fa9cb..4c953e22a48 100644 --- a/src/gallium/targets/libgl-xlib/meson.build +++ b/src/gallium/targets/libgl-xlib/meson.build @@ -17,7 +17,7 @@ libgl = shared_library( 'GL', files('xlib.c'), include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers, include_directories('../../frontends/glx/xlib'), ], gnu_symbol_visibility : 'hidden', diff --git a/src/gallium/targets/mediafoundation/meson.build b/src/gallium/targets/mediafoundation/meson.build index cc46a29c079..61a2fc2041f 100644 --- a/src/gallium/targets/mediafoundation/meson.build +++ b/src/gallium/targets/mediafoundation/meson.build @@ -94,7 +94,7 @@ foreach codec : mft_codecs cpp_args : mf_codecs_cpp_args[codec], override_options: ['cpp_std=c++20'], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_winsys_sw + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_winsys_sw ], link_whole : [mediafoundation_st[codec]], link_with : link_with_libmediafoundation_gallium, diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 8e7bfedc4cb..4111564af50 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -56,7 +56,7 @@ if host_machine.system() == 'windows' link_args : [va_link_args, ld_args_gc_sections, ld_args_build_id], vs_module_defs : vaon12_def, include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_winsys_sw + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_winsys_sw ], link_whole : [libva_st], link_with : link_with_libva_gallium, @@ -73,7 +73,7 @@ else gnu_symbol_visibility : 'hidden', link_args : [va_link_args, ld_args_gc_sections, ld_args_build_id], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], link_whole : [libva_st], link_with : link_with_libva_gallium, diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index c8630b42150..dd3b0189ffc 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -35,7 +35,7 @@ libvdpau_gallium = shared_library( gnu_symbol_visibility : 'hidden', link_args : [vdpau_link_args, ld_args_gc_sections], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], link_whole : [libvdpau_st], link_with : link_with_libvdpau_gallium, diff --git a/src/gallium/targets/wgl/meson.build b/src/gallium/targets/wgl/meson.build index 78c56ded38a..3a194b323d6 100644 --- a/src/gallium/targets/wgl/meson.build +++ b/src/gallium/targets/wgl/meson.build @@ -16,7 +16,7 @@ libgallium_wgl = shared_library( ['wgl.c'], vs_module_defs : wgl_def, include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_wgl, inc_gallium_winsys, inc_gallium_winsys_sw, inc_gallium_drivers, + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_wgl, inc_gallium_winsys, inc_gallium_winsys_sw, inc_gallium_drivers, ], link_whole : [libwgl], link_with : [ diff --git a/src/gallium/winsys/sw/xlib/meson.build b/src/gallium/winsys/sw/xlib/meson.build index d6abb5fcf4b..67e00d58b63 100644 --- a/src/gallium/winsys/sw/xlib/meson.build +++ b/src/gallium/winsys/sw/xlib/meson.build @@ -5,6 +5,6 @@ libws_xlib = static_library( 'ws_xlib', files('xlib_sw_winsys.c'), gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_x11, dep_xext, dep_xcb, idep_mesautil], ) diff --git a/src/gallium/winsys/virgl/common/meson.build b/src/gallium/winsys/virgl/common/meson.build index 9d9096eba42..eb17a46fc0c 100644 --- a/src/gallium/winsys/virgl/common/meson.build +++ b/src/gallium/winsys/virgl/common/meson.build @@ -4,7 +4,7 @@ libvirglcommon = static_library( 'virglcommon', 'virgl_resource_cache.c', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers], gnu_symbol_visibility : 'hidden', dependencies: idep_mesautil, ) diff --git a/src/gallium/winsys/virgl/drm/meson.build b/src/gallium/winsys/virgl/drm/meson.build index 3198bb46a2f..0947850cc12 100644 --- a/src/gallium/winsys/virgl/drm/meson.build +++ b/src/gallium/winsys/virgl/drm/meson.build @@ -4,7 +4,7 @@ libvirgldrm = static_library( 'virgldrm', 'virgl_drm_winsys.c', - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio], dependencies : [dep_libdrm, dep_libvirglcommon, idep_mesautil, idep_nir_headers], gnu_symbol_visibility : 'hidden', ) diff --git a/src/gallium/winsys/virgl/vtest/meson.build b/src/gallium/winsys/virgl/vtest/meson.build index 6aacd744417..dcce61a69b9 100644 --- a/src/gallium/winsys/virgl/vtest/meson.build +++ b/src/gallium/winsys/virgl/vtest/meson.build @@ -4,7 +4,7 @@ libvirglvtest = static_library( 'virglvtest', ['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio], dependencies : [dep_libvirglcommon, idep_mesautil], gnu_symbol_visibility : 'hidden', ) diff --git a/src/mesa/glapi/es1api/libgles1_public.c b/src/mesa/glapi/es1api/libgles1_public.c index c6e391454b5..ce0180501a7 100644 --- a/src/mesa/glapi/es1api/libgles1_public.c +++ b/src/mesa/glapi/es1api/libgles1_public.c @@ -9,13 +9,13 @@ /* REALLY_INITIAL_EXEC implies __GLIBC__ */ #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86_tls.h" +#include "../entry_x86_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #elif defined(USE_X86_64_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86-64_tls.h" +#include "../entry_x86-64_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(REALLY_INITIAL_EXEC) -#include "entry_ppc64le_tls.h" +#include "../entry_ppc64le_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #else diff --git a/src/mesa/glapi/es1api/meson.build b/src/mesa/glapi/es1api/meson.build index b5dd6398942..732116aba1a 100644 --- a/src/mesa/glapi/es1api/meson.build +++ b/src/mesa/glapi/es1api/meson.build @@ -33,7 +33,7 @@ libglesv1_cm = shared_library( ], gnu_symbol_visibility : 'hidden', link_args : [ld_args_gc_sections], - include_directories : [inc_src, inc_include, inc_mapi], + include_directories : [inc_src, inc_include], link_with : shared_glapi_lib, dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl, idep_mesautilc11], soversion : host_machine.system() == 'windows' ? '' : '1', diff --git a/src/mesa/glapi/es2api/libgles2_public.c b/src/mesa/glapi/es2api/libgles2_public.c index 28149e57475..5bd24f5a167 100644 --- a/src/mesa/glapi/es2api/libgles2_public.c +++ b/src/mesa/glapi/es2api/libgles2_public.c @@ -9,13 +9,13 @@ /* REALLY_INITIAL_EXEC implies __GLIBC__ */ #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86_tls.h" +#include "../entry_x86_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #elif defined(USE_X86_64_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86-64_tls.h" +#include "../entry_x86-64_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(REALLY_INITIAL_EXEC) -#include "entry_ppc64le_tls.h" +#include "../entry_ppc64le_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #else /* C version of the public entries */ diff --git a/src/mesa/glapi/es2api/meson.build b/src/mesa/glapi/es2api/meson.build index 3cc94c796b3..4ada85d8db8 100644 --- a/src/mesa/glapi/es2api/meson.build +++ b/src/mesa/glapi/es2api/meson.build @@ -33,7 +33,7 @@ libgles2 = shared_library( ], gnu_symbol_visibility : 'hidden', link_args : [ld_args_gc_sections], - include_directories : [inc_src, inc_include, inc_mapi], + include_directories : [inc_src, inc_include], link_with : shared_glapi_lib, dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl, idep_mesautilc11], soversion : host_machine.system() == 'windows' ? '' : '2', diff --git a/src/mesa/glapi/glapi/libgl_public.c b/src/mesa/glapi/glapi/libgl_public.c index 6d3737f7400..01d27519461 100644 --- a/src/mesa/glapi/glapi/libgl_public.c +++ b/src/mesa/glapi/glapi/libgl_public.c @@ -9,13 +9,13 @@ /* REALLY_INITIAL_EXEC implies __GLIBC__ */ #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86_tls.h" +#include "../entry_x86_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #elif defined(USE_X86_64_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86-64_tls.h" +#include "../entry_x86-64_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(REALLY_INITIAL_EXEC) -#include "entry_ppc64le_tls.h" +#include "../entry_ppc64le_tls.h" #define MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN #else diff --git a/src/mesa/glapi/glapi/meson.build b/src/mesa/glapi/glapi/meson.build index 2ce8e8ac825..87702d1d8ad 100644 --- a/src/mesa/glapi/glapi/meson.build +++ b/src/mesa/glapi/glapi/meson.build @@ -25,7 +25,7 @@ endif libglapi_bridge = static_library( 'glapi_bridge', bridge_glapi_files, - include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium], + include_directories : [inc_mesa, inc_include, inc_src, inc_gallium], c_args : [c_msvc_compat_args, bridge_glapi_args], dependencies : [dep_thread, idep_mesautil], build_by_default : false, diff --git a/src/mesa/glapi/shared-glapi/core.c b/src/mesa/glapi/shared-glapi/core.c index 119a5debd6f..6cc4046b9f9 100644 --- a/src/mesa/glapi/shared-glapi/core.c +++ b/src/mesa/glapi/shared-glapi/core.c @@ -5,7 +5,7 @@ * Chia-I Wu */ -#include "glapi/glapi.h" +#include "../glapi/glapi.h" struct mapi_stub { size_t name_offset; @@ -22,7 +22,7 @@ _mesa_noop_entrypoint(const char *name); /* REALLY_INITIAL_EXEC implies __GLIBC__ */ #if defined(USE_X86_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86_tls.h" +#include "../entry_x86_tls.h" #define MAPI_TMP_STUB_ASM_GCC #include "shared_glapi_mapi_tmp.h" @@ -89,7 +89,7 @@ entry_generate_or_patch(int slot, char *code, size_t size) } #elif defined(USE_X86_64_ASM) && defined(REALLY_INITIAL_EXEC) -#include "entry_x86-64_tls.h" +#include "../entry_x86-64_tls.h" #define MAPI_TMP_STUB_ASM_GCC #include "shared_glapi_mapi_tmp.h" @@ -110,7 +110,7 @@ entry_get_public(int slot) } #elif defined(USE_PPC64LE_ASM) && UTIL_ARCH_LITTLE_ENDIAN && defined(REALLY_INITIAL_EXEC) -#include "entry_ppc64le_tls.h" +#include "../entry_ppc64le_tls.h" #define MAPI_TMP_STUB_ASM_GCC #include "shared_glapi_mapi_tmp.h" diff --git a/src/mesa/glapi/shared-glapi/meson.build b/src/mesa/glapi/shared-glapi/meson.build index 3af5f304e6f..6d20b243c6a 100644 --- a/src/mesa/glapi/shared-glapi/meson.build +++ b/src/mesa/glapi/shared-glapi/meson.build @@ -20,7 +20,7 @@ libglapi = static_library( ], gnu_symbol_visibility : 'hidden', link_args : [ld_args_gc_sections], - include_directories : [inc_src, inc_include, inc_mapi], + include_directories : [inc_src, inc_include], dependencies : [dep_thread, idep_mesautil], install : false, ) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 73709ca0fd7..e93875a92e2 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -45,7 +45,7 @@ #include "main/glconfig.h" #include "main/menums.h" #include "main/config.h" -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" #include "math/m_matrix.h" /* GLmatrix */ #include "compiler/shader_enums.h" #include "compiler/shader_info.h" diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build index b61ebcbb23b..0cc6051a9f8 100644 --- a/src/mesa/main/tests/meson.build +++ b/src/mesa/main/tests/meson.build @@ -16,7 +16,7 @@ test( executable( 'main_test', [files_main_test, main_dispatch_h], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread, idep_nir_headers, idep_mesautil], link_with : [libmesa, libgallium, libglapi], ), diff --git a/src/mesa/meson.build b/src/mesa/meson.build index baa2f8de7ab..53017f6e8e8 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -443,7 +443,7 @@ if with_sse41 'mesa_sse41', files('main/sse_minmax.c'), c_args : [c_msvc_compat_args, sse41_args], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], gnu_symbol_visibility : 'hidden', ) else @@ -464,7 +464,7 @@ libmesa = static_library( cpp_args : [cpp_msvc_compat_args, _mesa_windows_args], gnu_symbol_visibility : 'hidden', include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, + inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main'), ], link_with : [libmesa_sse41], diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 558a3b2228b..efcc642ba9d 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -37,7 +37,7 @@ #include "main/hash.h" #include "program/prog_cache.h" #include "vbo/vbo.h" -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" #include "st_manager.h" #include "st_context.h" #include "st_debug.h" diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build index 3034b463677..1c362c91795 100644 --- a/src/mesa/state_tracker/tests/meson.build +++ b/src/mesa/state_tracker/tests/meson.build @@ -7,7 +7,7 @@ if not with_platform_windows executable( 'st_format_test', ['st_format.c'], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libmesa, libglapi, libgallium], dependencies : [idep_gtest, idep_mesautil], ), diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c index db7312503ec..4029f0fdc7b 100644 --- a/src/mesa/vbo/vbo_save_loopback.c +++ b/src/mesa/vbo/vbo_save_loopback.c @@ -31,7 +31,7 @@ #include "main/enums.h" #include "main/mesa_private.h" #include "dispatch.h" -#include "glapi/glapi.h" +#include "glapi/glapi/glapi.h" #include "vbo_private.h" diff --git a/src/meson.build b/src/meson.build index 6d6adc69966..7da2b6ae1bd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -7,7 +7,6 @@ subdir('android_stub') subdir('util') inc_mesa = include_directories('mesa') -inc_mapi = include_directories('mesa/glapi') inc_src = include_directories('.') inc_gallium = include_directories('gallium/include') inc_gallium_aux = include_directories('gallium/auxiliary') diff --git a/src/nouveau/compiler/meson.build b/src/nouveau/compiler/meson.build index 8aa2fbbc44f..0f2d28ce10a 100644 --- a/src/nouveau/compiler/meson.build +++ b/src/nouveau/compiler/meson.build @@ -164,7 +164,7 @@ nak_nir_algebraic_c = custom_target( _libnak = static_library( 'nak', [libnak_c_files, nak_nir_algebraic_c], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium], dependencies : libnak_deps, link_with : [_libnak_rs], c_args : [no_override_init_args],