diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build index 2c631bbbb54..e59917ddcb0 100644 --- a/src/gallium/drivers/r600/meson.build +++ b/src/gallium/drivers/r600/meson.build @@ -210,5 +210,5 @@ libr600 = static_library( driver_r600 = declare_dependency( compile_args : '-DGALLIUM_R600', - link_with : [libr600, libmesa_gallium, libradeonwinsys], + link_with : [libr600, libmesa, libradeonwinsys], ) diff --git a/src/gallium/frontends/nine/meson.build b/src/gallium/frontends/nine/meson.build index 1db612ec10d..dc840acc51f 100644 --- a/src/gallium/frontends/nine/meson.build +++ b/src/gallium/frontends/nine/meson.build @@ -71,6 +71,6 @@ libnine_st = static_library( dep_thread, idep_nir, idep_nir_headers ], link_with : [ - libmesa_gallium + libmesa ] ) diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 86f66a65abe..13846237cd9 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -48,7 +48,7 @@ libgallium_dri = shared_library( link_args : [ld_args_build_id, ld_args_gc_sections, gallium_dri_ld_args], link_depends : gallium_dri_link_depends, link_with : [ - libdri, libmesa_gallium, libdricommon, libmegadriver_stub, libgalliumvl, + libdri, libmesa, libdricommon, libmegadriver_stub, libgalliumvl, libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, ], diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build index b92bf005f27..2495779c9cc 100644 --- a/src/gallium/targets/haiku-softpipe/meson.build +++ b/src/gallium/targets/haiku-softpipe/meson.build @@ -30,7 +30,7 @@ libswpipe = shared_library( link_args : [ld_args_bsymbolic, ld_args_gc_sections], link_with : [ libglapi, libswhgl, libsthgl, libcompiler, - libmesa_gallium, libglsl, libgallium, libgl + libmesa, libglsl, libgallium, libgl ], dependencies : [ driver_swrast, cpp.find_library('be'), cpp.find_library('translation'), diff --git a/src/gallium/targets/libgl-d3d12/meson.build b/src/gallium/targets/libgl-d3d12/meson.build index 0f09d96478d..46e2edbfa44 100644 --- a/src/gallium/targets/libgl-d3d12/meson.build +++ b/src/gallium/targets/libgl-d3d12/meson.build @@ -28,7 +28,7 @@ libopenglon12 = shared_library( ], link_whole : [libwgl], link_with : [ - libgallium, libglsl, libmesa_gallium, libwsgdi, libd3d12winsys, libglapi_static, libglapi + libgallium, libglsl, libmesa, libwsgdi, libd3d12winsys, libglapi_static, libglapi ], dependencies : [ dep_ws2_32, idep_nir, idep_mesautil, driver_d3d12 diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build index 7f161f7791a..0c38586c943 100644 --- a/src/gallium/targets/libgl-xlib/meson.build +++ b/src/gallium/targets/libgl-xlib/meson.build @@ -50,7 +50,7 @@ libgl = shared_library( link_depends : gallium_xlib_link_depends, link_with : [ libxlib, libws_xlib, libglapi_static, - libgallium, libmesa_gallium, gallium_xlib_link_with, + libgallium, libmesa, gallium_xlib_link_with, ], dependencies : [dep_x11, dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr, driver_virgl, driver_asahi], install : true, diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index 497f000ee42..b29e3ff0340 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -51,7 +51,7 @@ libosmesa = shared_library( link_depends : osmesa_link_deps, link_whole : [libosmesa_st, libglapi_static], link_with : [ - libmesa_gallium, libgallium, libws_null, osmesa_link_with, + libmesa, libgallium, libws_null, osmesa_link_with, ], dependencies : [ dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, diff --git a/src/gallium/targets/wgl/meson.build b/src/gallium/targets/wgl/meson.build index 27afb1f0be7..ed0f3926a7e 100644 --- a/src/gallium/targets/wgl/meson.build +++ b/src/gallium/targets/wgl/meson.build @@ -39,7 +39,7 @@ libgallium_wgl = shared_library( ], link_whole : [libwgl], link_with : [ - libgallium, libglsl, libmesa_gallium, libwsgdi, libglapi_static, libglapi + libgallium, libglsl, libmesa, libwsgdi, libglapi_static, libglapi ], dependencies : [ dep_ws2_32, idep_nir, idep_mesautil, driver_swrast, driver_swr, diff --git a/src/mesa/main/tests/meson.build b/src/mesa/main/tests/meson.build index 71b53750e0b..ce924251cc1 100644 --- a/src/mesa/main/tests/meson.build +++ b/src/mesa/main/tests/meson.build @@ -39,7 +39,7 @@ test( [files_main_test, main_dispatch_h], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium], dependencies : [idep_gtest, dep_clock, dep_dl, dep_thread, idep_mesautil], - link_with : [libmesa_gallium, link_main_test], + link_with : [libmesa, link_main_test], ), suite : ['mesa'], protocol : gtest_test_protocol, diff --git a/src/mesa/meson.build b/src/mesa/meson.build index ed6d7101a18..8b308a7ba0a 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -22,40 +22,7 @@ subdir('program') subdir('main') # files shared between classic mesa and gallium mesa -files_libmesa_common = files( - 'program/arbprogparse.c', - 'program/arbprogparse.h', - 'program/ir_to_mesa.cpp', - 'program/ir_to_mesa.h', - 'program/prog_cache.c', - 'program/prog_cache.h', - 'program/prog_execute.c', - 'program/prog_execute.h', - 'program/prog_instruction.c', - 'program/prog_instruction.h', - 'program/prog_noise.c', - 'program/prog_noise.h', - 'program/prog_opt_constant_fold.c', - 'program/prog_optimize.c', - 'program/prog_optimize.h', - 'program/prog_parameter.c', - 'program/prog_parameter.h', - 'program/prog_parameter_layout.c', - 'program/prog_parameter_layout.h', - 'program/prog_print.c', - 'program/prog_print.h', - 'program/program.c', - 'program/program.h', - 'program/programopt.c', - 'program/programopt.h', - 'program/program_parse_extra.c', - 'program/program_parser.h', - 'program/prog_statevars.c', - 'program/prog_statevars.h', - 'program/symbol_table.c', - 'program/symbol_table.h', - 'program/prog_to_nir.c', - 'program/prog_to_nir.h', +files_libmesa = files( 'main/accum.c', 'main/accum.h', 'main/api_arrayelt.c', @@ -114,17 +81,19 @@ files_libmesa_common = files( 'main/dlist.h', 'main/draw.c', 'main/draw.h', + 'main/draw_validate.c', + 'main/draw_validate.h', 'main/drawpix.c', 'main/drawpix.h', 'main/drawtex.c', 'main/drawtex.h', - 'main/draw_validate.c', - 'main/draw_validate.h', 'main/enable.c', 'main/enable.h', 'main/enums.h', 'main/errors.c', 'main/errors.h', + 'main/es1_conversion.c', + 'main/es1_conversion.h', 'main/eval.c', 'main/eval.h', 'main/execmem.c', @@ -145,21 +114,22 @@ files_libmesa_common = files( 'main/fog.h', 'main/format_pack.h', 'main/format_unpack.h', + 'main/format_utils.c', + 'main/format_utils.h', 'main/formatquery.c', 'main/formatquery.h', 'main/formats.c', 'main/formats.h', - 'main/format_utils.c', - 'main/format_utils.h', 'main/framebuffer.c', 'main/framebuffer.h', - 'main/get.c', - 'main/get.h', 'main/genmipmap.c', 'main/genmipmap.h', + 'main/get.c', + 'main/get.h', 'main/getstring.c', 'main/glformats.c', 'main/glformats.h', + 'main/glheader.h', 'main/glspirv.c', 'main/glspirv.h', 'main/glthread.c', @@ -171,7 +141,6 @@ files_libmesa_common = files( 'main/glthread_marshal.h', 'main/glthread_shaderobj.c', 'main/glthread_varray.c', - 'main/glheader.h', 'main/hash.c', 'main/hash.h', 'main/hint.c', @@ -180,7 +149,6 @@ files_libmesa_common = files( 'main/histogram.h', 'main/image.c', 'main/image.h', - 'main/mesa_private.h', 'main/light.c', 'main/light.h', 'main/lines.c', @@ -188,9 +156,10 @@ files_libmesa_common = files( 'main/macros.h', 'main/matrix.c', 'main/matrix.h', + 'main/menums.h', + 'main/mesa_private.h', 'main/mipmap.c', 'main/mipmap.h', - 'main/menums.h', 'main/mtypes.h', 'main/multisample.c', 'main/multisample.h', @@ -239,13 +208,13 @@ files_libmesa_common = files( 'main/samplerobj.h', 'main/scissor.c', 'main/scissor.h', + 'main/shader_query.cpp', 'main/shaderapi.c', 'main/shaderapi.h', 'main/shaderimage.c', 'main/shaderimage.h', 'main/shaderobj.c', 'main/shaderobj.h', - 'main/shader_query.cpp', 'main/shared.c', 'main/shared.h', 'main/spirv_extensions.c', @@ -257,6 +226,7 @@ files_libmesa_common = files( 'main/syncobj.c', 'main/syncobj.h', 'main/texcompress.c', + 'main/texcompress.h', 'main/texcompress_astc.cpp', 'main/texcompress_astc.h', 'main/texcompress_bptc.c', @@ -268,7 +238,6 @@ files_libmesa_common = files( 'main/texcompress_etc_tmp.h', 'main/texcompress_fxt1.c', 'main/texcompress_fxt1.h', - 'main/texcompress.h', 'main/texcompress_rgtc.c', 'main/texcompress_rgtc.h', 'main/texcompress_s3tc.c', @@ -313,8 +282,6 @@ files_libmesa_common = files( 'main/viewport.h', 'main/vtxfmt.c', 'main/vtxfmt.h', - 'main/es1_conversion.c', - 'main/es1_conversion.h', 'math/m_debug.h', 'math/m_debug_clip.c', 'math/m_debug_norm.c', @@ -329,43 +296,52 @@ files_libmesa_common = files( 'math/m_translate.h', 'math/m_vector.c', 'math/m_vector.h', - 'vbo/vbo_attrib.h', - 'vbo/vbo_attrib_tmp.h', - 'vbo/vbo_context.c', - 'vbo/vbo_exec_api.c', - 'vbo/vbo_exec.c', - 'vbo/vbo_exec_draw.c', - 'vbo/vbo_exec_eval.c', - 'vbo/vbo_exec.h', - 'vbo/vbo.h', - 'vbo/vbo_init_tmp.h', - 'vbo/vbo_minmax_index.c', - 'vbo/vbo_noop.c', - 'vbo/vbo_noop.h', - 'vbo/vbo_save_api.c', - 'vbo/vbo_save.c', - 'vbo/vbo_save_draw.c', - 'vbo/vbo_save.h', - 'vbo/vbo_save_loopback.c', - 'vbo/vbo_util.h', - 'x86/common_x86.c', -) - -files_libmesa_gallium = files( + 'program/arbprogparse.c', + 'program/arbprogparse.h', + 'program/ir_to_mesa.cpp', + 'program/ir_to_mesa.h', + 'program/prog_cache.c', + 'program/prog_cache.h', + 'program/prog_execute.c', + 'program/prog_execute.h', + 'program/prog_instruction.c', + 'program/prog_instruction.h', + 'program/prog_noise.c', + 'program/prog_noise.h', + 'program/prog_opt_constant_fold.c', + 'program/prog_optimize.c', + 'program/prog_optimize.h', + 'program/prog_parameter.c', + 'program/prog_parameter.h', + 'program/prog_parameter_layout.c', + 'program/prog_parameter_layout.h', + 'program/prog_print.c', + 'program/prog_print.h', + 'program/prog_statevars.c', + 'program/prog_statevars.h', + 'program/prog_to_nir.c', + 'program/prog_to_nir.h', + 'program/program.c', + 'program/program.h', + 'program/program_parse_extra.c', + 'program/program_parser.h', + 'program/programopt.c', + 'program/programopt.h', + 'program/symbol_table.c', + 'program/symbol_table.h', 'state_tracker/st_atifs_to_nir.c', 'state_tracker/st_atifs_to_nir.h', + 'state_tracker/st_atom.c', 'state_tracker/st_atom_array.cpp', 'state_tracker/st_atom_atomicbuf.c', 'state_tracker/st_atom_blend.c', - 'state_tracker/st_atom.c', 'state_tracker/st_atom_clip.c', 'state_tracker/st_atom_constbuf.c', 'state_tracker/st_atom_constbuf.h', 'state_tracker/st_atom_depth.c', 'state_tracker/st_atom_framebuffer.c', - 'state_tracker/st_atom.h', - 'state_tracker/st_atom_list.h', 'state_tracker/st_atom_image.c', + 'state_tracker/st_atom_list.h', 'state_tracker/st_atom_msaa.c', 'state_tracker/st_atom_pixeltransfer.c', 'state_tracker/st_atom_rasterizer.c', @@ -421,16 +397,16 @@ files_libmesa_gallium = files( 'state_tracker/st_cb_rasterpos.h', 'state_tracker/st_cb_readpixels.c', 'state_tracker/st_cb_readpixels.h', - 'state_tracker/st_cb_strings.c', - 'state_tracker/st_cb_strings.h', 'state_tracker/st_cb_semaphoreobjects.c', 'state_tracker/st_cb_semaphoreobjects.h', + 'state_tracker/st_cb_strings.c', + 'state_tracker/st_cb_strings.h', 'state_tracker/st_cb_syncobj.c', 'state_tracker/st_cb_syncobj.h', - 'state_tracker/st_cb_texturebarrier.c', - 'state_tracker/st_cb_texturebarrier.h', 'state_tracker/st_cb_texture.c', 'state_tracker/st_cb_texture.h', + 'state_tracker/st_cb_texturebarrier.c', + 'state_tracker/st_cb_texturebarrier.h', 'state_tracker/st_cb_viewport.c', 'state_tracker/st_cb_viewport.h', 'state_tracker/st_cb_xformfb.c', @@ -442,8 +418,8 @@ files_libmesa_gallium = files( 'state_tracker/st_debug.c', 'state_tracker/st_debug.h', 'state_tracker/st_draw.c', - 'state_tracker/st_draw_feedback.c', 'state_tracker/st_draw.h', + 'state_tracker/st_draw_feedback.c', 'state_tracker/st_extensions.c', 'state_tracker/st_extensions.h', 'state_tracker/st_format.c', @@ -488,11 +464,31 @@ files_libmesa_gallium = files( 'state_tracker/st_util.h', 'state_tracker/st_vdpau.c', 'state_tracker/st_vdpau.h', + 'vbo/vbo.h', + 'vbo/vbo_attrib.h', + 'vbo/vbo_attrib_tmp.h', + 'vbo/vbo_context.c', + 'vbo/vbo_exec.c', + 'vbo/vbo_exec.h', + 'vbo/vbo_exec_api.c', + 'vbo/vbo_exec_draw.c', + 'vbo/vbo_exec_eval.c', + 'vbo/vbo_init_tmp.h', + 'vbo/vbo_minmax_index.c', + 'vbo/vbo_noop.c', + 'vbo/vbo_noop.h', + 'vbo/vbo_save.c', + 'vbo/vbo_save.h', + 'vbo/vbo_save_api.c', + 'vbo/vbo_save_draw.c', + 'vbo/vbo_save_loopback.c', + 'vbo/vbo_util.h', + 'x86/common_x86.c', ) inc_libmesa_asm = [] if with_asm_arch == 'x86' - files_libmesa_common += files( + files_libmesa += files( 'x86/assyntax.h', 'x86/common_x86_asm.S', 'x86/common_x86_asm.h', @@ -501,7 +497,7 @@ if with_asm_arch == 'x86' ) inc_libmesa_asm = include_directories('x86') elif with_asm_arch == 'x86_64' - files_libmesa_common += files('x86-64/x86-64.h', 'x86-64/xform4.S') + files_libmesa += files('x86-64/x86-64.h', 'x86-64/xform4.S') inc_libmesa_asm = include_directories('x86-64') endif @@ -523,7 +519,7 @@ get_hash_h = custom_target( ) foreach x : [['format_info.h', 'format_info.py']] - files_libmesa_common += custom_target( + files_libmesa += custom_target( x[0], input : ['main/@0@'.format(x[1]), 'main/formats.csv'], output : x[0], @@ -533,7 +529,7 @@ foreach x : [['format_info.h', 'format_info.py']] ) endforeach -files_libmesa_common += [ +files_libmesa += [ mesa_lex, program_parse_tab, main_api_exec_c, @@ -546,10 +542,6 @@ files_libmesa_common += [ main_remap_helper_h, sha1_h, ] + main_marshal_generated_c -files_libmesa_gallium += [ - ir_expression_operation_h, - sha1_h, -] if with_sse41 libmesa_sse41 = static_library( @@ -575,25 +567,17 @@ if with_platform_windows endif endif -libmesa_common = static_library( - 'mesa_common', - files_libmesa_common, +libmesa = static_library( + 'mesa', + files_libmesa, c_args : [c_msvc_compat_args, _mesa_windows_args], 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_libmesa_asm, include_directories('main')], - dependencies : [idep_nir_headers, idep_mesautil], - build_by_default : false, -) - -libmesa_gallium = static_library( - 'mesa_gallium', - files_libmesa_gallium, - c_args : [c_msvc_compat_args, _mesa_windows_args], - 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_libmesa_asm, include_directories('main')], - link_with : [libmesa_common, libglsl, libmesa_sse41], + include_directories : [ + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, + inc_libmesa_asm, include_directories('main'), + ], + link_with : [libglsl, libmesa_sse41], dependencies : [idep_nir_headers, dep_vdpau, idep_mesautil], build_by_default : false, ) diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build index c308107d64f..5f53f1d186e 100644 --- a/src/mesa/state_tracker/tests/meson.build +++ b/src/mesa/state_tracker/tests/meson.build @@ -32,7 +32,7 @@ test( ['st_format.c'], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [ - libmesa_st_test_common, libmesa_gallium, libglapi, libgallium, + libmesa_st_test_common, libmesa, libglapi, libgallium, ], dependencies : idep_mesautil, ), @@ -46,7 +46,7 @@ test( ['test_glsl_to_tgsi_lifetime.cpp', ir_expression_operation_h], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [ - libmesa_st_test_common, libmesa_gallium, libglapi, libgallium, + libmesa_st_test_common, libmesa, libglapi, libgallium, ], dependencies : [idep_mesautil, idep_gtest], ), @@ -61,7 +61,7 @@ test( ['test_glsl_to_tgsi_array_merge.cpp', ir_expression_operation_h], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [ - libmesa_st_test_common, libmesa_gallium, libglapi, libgallium, + libmesa_st_test_common, libmesa, libglapi, libgallium, ], dependencies : [idep_mesautil, idep_gtest], ),