diff options
Diffstat (limited to 'src/gallium')
32 files changed, 34 insertions, 33 deletions
diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index 69db8050ee4..580391ac10e 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -69,7 +69,7 @@ foreach v : ['80', '90', '100', '110', '120'] iris_gen_libs += static_library( 'iris_gen@0@'.format(v), ['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack], - include_directories : [inc_common, inc_intel], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], c_args : [ c_vis_args, no_override_init_args, c_sse2_args, '-DGEN_VERSIONx10=@0@'.format(v), diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build index e48b61b8955..7a1d18a6394 100644 --- a/src/gallium/drivers/nouveau/meson.build +++ b/src/gallium/drivers/nouveau/meson.build @@ -212,7 +212,7 @@ libnouveau = static_library( 'nouveau', files_libnouveau, include_directories : [ - inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_common, + inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa, ], c_args : [c_vis_args], cpp_args : [cpp_vis_args], diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index 2d0789db802..92f043ea0a0 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -47,7 +47,8 @@ files_panfrost = files( ) panfrost_includes = [ - inc_common, + inc_mapi, + inc_mesa, inc_gallium, inc_gallium_aux, inc_include, diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build index ecdf8504032..55d84241276 100644 --- a/src/gallium/drivers/r600/meson.build +++ b/src/gallium/drivers/r600/meson.build @@ -187,7 +187,7 @@ libr600 = static_library( c_args : [c_vis_args, r600_c_args, '-Wstrict-overflow=0'], cpp_args : [cpp_vis_args], include_directories : [ - inc_src, inc_common, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common, + inc_src, inc_mapi, inc_mesa, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common, inc_gallium_drivers, ], dependencies: [dep_libdrm_radeon, dep_elf, dep_llvm, idep_nir, idep_nir_headers], diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build index 6b6ec3652ec..e68d962ed84 100644 --- a/src/gallium/drivers/swr/meson.build +++ b/src/gallium/drivers/swr/meson.build @@ -383,7 +383,7 @@ libmesaswr = static_library( cpp_msvc_compat_args, cpp_vis_args, swr_cpp_args, swr_avx_args, swr_defines, ], - include_directories : [inc_common, swr_incs], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, swr_incs], dependencies : dep_llvm, ) diff --git a/src/gallium/drivers/virgl/meson.build b/src/gallium/drivers/virgl/meson.build index 0c04370d4ec..dd33d2b7c66 100644 --- a/src/gallium/drivers/virgl/meson.build +++ b/src/gallium/drivers/virgl/meson.build @@ -47,7 +47,7 @@ libvirgl = static_library( 'virgl', [ files_libvirgl, virgl_driinfo_h ], c_args : c_vis_args, - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : dep_libdrm ) diff --git a/src/gallium/drivers/virgl/tests/meson.build b/src/gallium/drivers/virgl/tests/meson.build index 86cb27db4e1..ec538c9e0b0 100644 --- a/src/gallium/drivers/virgl/tests/meson.build +++ b/src/gallium/drivers/virgl/tests/meson.build @@ -24,7 +24,7 @@ test( 'virgl_staging_mgr_test', files('virgl_staging_mgr_test.cpp'), dependencies : [dep_thread, idep_gtest], - include_directories : [inc_common, include_directories('..')], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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 ccef3ff3b21..cab79ddae18 100644 --- a/src/gallium/drivers/zink/meson.build +++ b/src/gallium/drivers/zink/meson.build @@ -43,7 +43,7 @@ libzink = static_library( 'zink', files_libzink, c_args : c_vis_args, - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies: [dep_vulkan, idep_nir_headers], ) diff --git a/src/gallium/state_trackers/glx/xlib/meson.build b/src/gallium/state_trackers/glx/xlib/meson.build index 34b93c94cf2..7b1fdb34ffe 100644 --- a/src/gallium/state_trackers/glx/xlib/meson.build +++ b/src/gallium/state_trackers/glx/xlib/meson.build @@ -22,6 +22,6 @@ libxlib = static_library( 'xlib', files('glx_api.c', 'glx_getproc.c', 'glx_usefont.c', 'xm_api.c', 'xm_st.c'), c_args : c_vis_args, - include_directories : [inc_common, inc_mapi, inc_mesa], + include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa], dependencies : [dep_x11, dep_xext, dep_xcb, dep_glproto], ) diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build index 987d3e23c84..35866c1cba0 100644 --- a/src/gallium/state_trackers/omx/meson.build +++ b/src/gallium/state_trackers/omx/meson.build @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -inc_st_omx = [inc_common] +inc_st_omx = [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux] dep_st_omx = [ dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, ] diff --git a/src/gallium/state_trackers/va/meson.build b/src/gallium/state_trackers/va/meson.build index 84f788fdbaa..1929d907b9d 100644 --- a/src/gallium/state_trackers/va/meson.build +++ b/src/gallium/state_trackers/va/meson.build @@ -34,7 +34,7 @@ libva_st = static_library( libva_version[0], libva_version[1] ), ], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [ dep_va_headers, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, diff --git a/src/gallium/state_trackers/xa/meson.build b/src/gallium/state_trackers/xa/meson.build index 44d97586240..0c3540f0359 100644 --- a/src/gallium/state_trackers/xa/meson.build +++ b/src/gallium/state_trackers/xa/meson.build @@ -39,7 +39,7 @@ libxa_st = static_library( 'xa_tracker.c', 'xa_yuv.c', )], c_args : [c_vis_args, '-pedantic'], - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], ) install_headers('xa_composite.h', 'xa_context.h') diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build index ab658fcad69..9022bf4d0a6 100644 --- a/src/gallium/state_trackers/xvmc/meson.build +++ b/src/gallium/state_trackers/xvmc/meson.build @@ -22,7 +22,7 @@ libxvmc_st = static_library( 'xvmc_st', files('attributes.c', 'block.c', 'context.c', 'surface.c', 'subpicture.c'), c_args : [c_vis_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [ dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv, dep_libdrm, diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index ae25a21cb33..8da21b3394a 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -41,7 +41,7 @@ libgallium_dri = shared_library( 'gallium_dri', files('target.c'), include_directories : [ - inc_common, inc_util, inc_dri_common, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_dri_common, inc_gallium_drivers, inc_gallium_winsys, include_directories('../../state_trackers/dri'), ], c_args : [c_vis_args], diff --git a/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build index 7e539b04418..39471b64064 100644 --- a/src/gallium/targets/graw-null/meson.build +++ b/src/gallium/targets/graw-null/meson.build @@ -22,14 +22,14 @@ libgraw_util = static_library( 'graw_util', ['graw_util.c'], c_args : [c_vis_args, c_msvc_compat_args], - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], ) libgraw_null = shared_library( 'graw_null', ['graw_null.c'], c_args : [c_vis_args, c_msvc_compat_args], - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : libgallium, dependencies : idep_mesautil, name_prefix : host_machine.system() == 'windows' ? '' : 'lib', # otherwise mingw will create libgraw_null.dll diff --git a/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build index 92f483733cf..0e5d91b9fdd 100644 --- a/src/gallium/targets/graw-xlib/meson.build +++ b/src/gallium/targets/graw-xlib/meson.build @@ -22,7 +22,7 @@ libgraw_xlib = shared_library( 'graw_xlib', ['graw_xlib.c'], c_args : [c_vis_args], - include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium_winsys], link_with : [ libgraw_util, libgallium, libws_xlib ], diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build index d92f583210d..e35fab5dacf 100644 --- a/src/gallium/targets/haiku-softpipe/meson.build +++ b/src/gallium/targets/haiku-softpipe/meson.build @@ -22,7 +22,7 @@ libswpipe = shared_library( 'swpipe', files('SoftwareRenderer.cpp', 'GalliumContext.cpp'), include_directories : [ - inc_common, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys, include_directories('../../state_trackers/hgl'), include_directories('/boot/system/develop/headers/private') ], diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build index cd4e02d1fa9..6332267fff4 100644 --- a/src/gallium/targets/libgl-gdi/meson.build +++ b/src/gallium/targets/libgl-gdi/meson.build @@ -31,7 +31,7 @@ libopengl32 = shared_library( ['libgl_gdi.c'], vs_module_defs : ogldef, include_directories : [ - inc_common, inc_wgl, inc_gallium_winsys_sw, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_wgl, inc_gallium_winsys_sw, inc_gallium_drivers, ], link_whole : [libwgl], link_with : [ diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build index 921f948ca3a..8aec6219a87 100644 --- a/src/gallium/targets/libgl-xlib/meson.build +++ b/src/gallium/targets/libgl-xlib/meson.build @@ -41,7 +41,7 @@ libgl = shared_library( 'GL', files('xlib.c'), include_directories : [ - inc_common, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers, include_directories('../../state_trackers/glx/xlib'), ], c_args : [c_vis_args, gallium_xlib_c_args], diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build index 98f01cd7510..86311c30cb9 100644 --- a/src/gallium/targets/omx/meson.build +++ b/src/gallium/targets/omx/meson.build @@ -37,7 +37,7 @@ libomx_gallium = shared_library( cpp_args : cpp_vis_args, link_args : [omx_link_args, ld_args_gc_sections], include_directories : [ - inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], link_whole : [libomx_st], link_with : [ diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index e43aba9029f..92cd0aa06a5 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -77,7 +77,7 @@ if with_tests executable( 'osmesa-render', 'test-render.cpp', - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with: libosmesa, dependencies : [idep_gtest], ), diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 24d291c78a9..e9a3ee126fa 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -38,7 +38,7 @@ libva_gallium = shared_library( cpp_args : cpp_vis_args, link_args : [va_link_args, ld_args_gc_sections], include_directories : [ - inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], link_whole : [libva_st], link_with : [ diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 2032fa09674..4ea12c4ef02 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -43,7 +43,7 @@ libvdpau_gallium = shared_library( cpp_args : cpp_vis_args, link_args : [vdpau_link_args, ld_args_gc_sections], include_directories : [ - inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], link_whole : [libvdpau_st], link_with : [ diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build index c669b0135b9..d61dbd9842b 100644 --- a/src/gallium/targets/xa/meson.build +++ b/src/gallium/targets/xa/meson.build @@ -39,7 +39,7 @@ libxatracker = shared_library( cpp_args : cpp_vis_args, link_args : [xa_link_args, ld_args_gc_sections], include_directories : [ - inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], link_whole : [libxa_st], link_with : [ diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build index c1f20191b4b..b96a9d34465 100644 --- a/src/gallium/targets/xvmc/meson.build +++ b/src/gallium/targets/xvmc/meson.build @@ -38,7 +38,7 @@ libxvmc_gallium = shared_library( cpp_args : cpp_vis_args, link_args : [xvmc_link_args, ld_args_gc_sections], include_directories : [ - inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers, ], link_whole : [libxvmc_st], link_with : [ diff --git a/src/gallium/tests/graw/meson.build b/src/gallium/tests/graw/meson.build index 9a1f4e7db00..6d6840eb1d2 100644 --- a/src/gallium/tests/graw/meson.build +++ b/src/gallium/tests/graw/meson.build @@ -29,7 +29,7 @@ foreach t : progs executable( 'graw-' + t, t + '.c', - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libgraw, libgraw_util, libgallium], dependencies : [dep_m, idep_mesautil], ) diff --git a/src/gallium/tests/trivial/meson.build b/src/gallium/tests/trivial/meson.build index bc6fbac47a9..a54e71d7225 100644 --- a/src/gallium/tests/trivial/meson.build +++ b/src/gallium/tests/trivial/meson.build @@ -22,7 +22,7 @@ foreach t : ['compute', 'tri', 'quad-tex'] executable( t, '@[email protected]'.format(t), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libgallium, libpipe_loader_dynamic], dependencies : idep_mesautil, install : false, diff --git a/src/gallium/tests/unit/meson.build b/src/gallium/tests/unit/meson.build index 3a6badace7e..f94e1058d2c 100644 --- a/src/gallium/tests/unit/meson.build +++ b/src/gallium/tests/unit/meson.build @@ -23,7 +23,7 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test', exe = executable( t, '@[email protected]'.format(t), - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : libgallium, dependencies : idep_mesautil, install : false, diff --git a/src/gallium/winsys/sw/xlib/meson.build b/src/gallium/winsys/sw/xlib/meson.build index c7cb0ffe9d5..d1f5759b052 100644 --- a/src/gallium/winsys/sw/xlib/meson.build +++ b/src/gallium/winsys/sw/xlib/meson.build @@ -22,6 +22,6 @@ libws_xlib = static_library( 'ws_xlib', files('xlib_sw_winsys.c'), c_args : c_vis_args, - include_directories : inc_common, + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_x11, dep_xext, dep_xcb], ) diff --git a/src/gallium/winsys/virgl/common/meson.build b/src/gallium/winsys/virgl/common/meson.build index 9182b79a675..18a40f28ec1 100644 --- a/src/gallium/winsys/virgl/common/meson.build +++ b/src/gallium/winsys/virgl/common/meson.build @@ -22,7 +22,7 @@ libvirglcommon = static_library( 'virglcommon', 'virgl_resource_cache.c', c_args : c_vis_args, - include_directories : [inc_common, inc_gallium_drivers], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers], ) dep_libvirglcommon = declare_dependency( diff --git a/src/gallium/winsys/virgl/drm/meson.build b/src/gallium/winsys/virgl/drm/meson.build index cbb5fb9d4b2..0bfeafaeae9 100644 --- a/src/gallium/winsys/virgl/drm/meson.build +++ b/src/gallium/winsys/virgl/drm/meson.build @@ -22,6 +22,6 @@ libvirgldrm = static_library( 'virgldrm', 'virgl_drm_winsys.c', c_args : c_vis_args, - include_directories : [inc_common, inc_gallium_drivers], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers], dependencies : [dep_libdrm, dep_libvirglcommon], ) diff --git a/src/gallium/winsys/virgl/vtest/meson.build b/src/gallium/winsys/virgl/vtest/meson.build index 9befea6735a..6363e62c747 100644 --- a/src/gallium/winsys/virgl/vtest/meson.build +++ b/src/gallium/winsys/virgl/vtest/meson.build @@ -22,6 +22,6 @@ libvirglvtest = static_library( 'virglvtest', ['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'], c_args : c_vis_args, - include_directories : [inc_common, inc_gallium_drivers], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers], dependencies : dep_libvirglcommon, ) |