X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmeson.build;h=27e8058766a10ac4ea57cc6e69c9d3ce494cef6f;hb=a0d667036d8c8b77fa62f74263583b07909f8637;hp=05a3a9ac55ddd8b068d54020dfc02000b68285c4;hpb=84486f64626ad2b51291b84965d1bc96f68d8127;p=mesa.git diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 05a3a9ac55d..27e8058766a 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -18,8 +18,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# TODO: main/tests - subdir('program') subdir('main') @@ -65,8 +63,6 @@ files_libmesa_common = files( 'main/api_exec.h', 'main/api_loopback.c', 'main/api_loopback.h', - 'main/api_validate.c', - 'main/api_validate.h', 'main/arbprogram.c', 'main/arbprogram.h', 'main/arrayobj.c', @@ -100,13 +96,14 @@ files_libmesa_common = files( 'main/condrender.c', 'main/condrender.h', 'main/config.h', + 'main/conservativeraster.c', + 'main/conservativeraster.h', 'main/context.c', 'main/context.h', 'main/convolve.c', 'main/convolve.h', 'main/copyimage.c', 'main/copyimage.h', - 'main/core.h', 'main/cpuinfo.c', 'main/cpuinfo.h', 'main/dd.h', @@ -118,10 +115,14 @@ files_libmesa_common = files( 'main/depth.h', 'main/dlist.c', 'main/dlist.h', + 'main/draw.c', + 'main/draw.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', @@ -162,6 +163,8 @@ files_libmesa_common = files( 'main/getstring.c', 'main/glformats.c', 'main/glformats.h', + 'main/glspirv.c', + 'main/glspirv.h', 'main/glthread.c', 'main/glthread.h', 'main/glheader.h', @@ -188,6 +191,7 @@ files_libmesa_common = files( 'main/mipmap.h', 'main/mm.c', 'main/mm.h', + 'main/menums.h', 'main/mtypes.h', 'main/multisample.c', 'main/multisample.h', @@ -215,6 +219,8 @@ files_libmesa_common = files( 'main/points.h', 'main/polygon.c', 'main/polygon.h', + 'main/program_binary.c', + 'main/program_binary.h', 'main/program_resource.c', 'main/program_resource.h', 'main/querymatrix.c', @@ -243,6 +249,8 @@ files_libmesa_common = files( 'main/shader_query.cpp', 'main/shared.c', 'main/shared.h', + 'main/spirv_extensions.c', + 'main/spirv_extensions.h', 'main/state.c', 'main/state.h', 'main/stencil.c', @@ -250,6 +258,8 @@ files_libmesa_common = files( 'main/syncobj.c', 'main/syncobj.h', 'main/texcompress.c', + 'main/texcompress_astc.cpp', + 'main/texcompress_astc.h', 'main/texcompress_bptc.c', 'main/texcompress_bptc.h', 'main/texcompress_cpal.c', @@ -323,9 +333,7 @@ files_libmesa_common = files( 'vbo/vbo_attrib.h', 'vbo/vbo_attrib_tmp.h', 'vbo/vbo_context.c', - 'vbo/vbo_context.h', 'vbo/vbo_exec_api.c', - 'vbo/vbo_exec_array.c', 'vbo/vbo_exec.c', 'vbo/vbo_exec_draw.c', 'vbo/vbo_exec_eval.c', @@ -335,16 +343,11 @@ files_libmesa_common = files( 'vbo/vbo_noop.c', 'vbo/vbo_noop.h', 'vbo/vbo_primitive_restart.c', - 'vbo/vbo_rebase.c', '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_split.c', - 'vbo/vbo_split_copy.c', - 'vbo/vbo_split.h', - 'vbo/vbo_split_inplace.c', 'x86/common_x86.c', ) @@ -363,6 +366,11 @@ files_libmesa_classic = files( 'tnl/tnl.h', 'tnl/t_pipeline.c', 'tnl/t_pipeline.h', + 'tnl/t_rebase.c', + 'tnl/t_split.c', + 'tnl/t_split_copy.c', + 'tnl/t_split.h', + 'tnl/t_split_inplace.c', 'tnl/t_vb_cliptmp.h', 'tnl/t_vb_fog.c', 'tnl/t_vb_light.c', @@ -482,7 +490,6 @@ files_libmesa_gallium = files( 'state_tracker/st_atom_sampler.c', 'state_tracker/st_atom_scissor.c', 'state_tracker/st_atom_shader.c', - 'state_tracker/st_atom_shader.h', 'state_tracker/st_atom_stipple.c', 'state_tracker/st_atom_storagebuf.c', 'state_tracker/st_atom_tess.c', @@ -532,6 +539,8 @@ files_libmesa_gallium = files( '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_syncobj.c', 'state_tracker/st_cb_syncobj.h', 'state_tracker/st_cb_texturebarrier.c', @@ -558,9 +567,13 @@ files_libmesa_gallium = files( 'state_tracker/st_gen_mipmap.c', 'state_tracker/st_gen_mipmap.h', 'state_tracker/st_gl_api.h', + 'state_tracker/st_glsl_to_ir.cpp', + 'state_tracker/st_glsl_to_ir.h', 'state_tracker/st_glsl_to_nir.cpp', 'state_tracker/st_glsl_to_tgsi.cpp', 'state_tracker/st_glsl_to_tgsi.h', + 'state_tracker/st_glsl_to_tgsi_array_merge.cpp', + 'state_tracker/st_glsl_to_tgsi_array_merge.h', 'state_tracker/st_glsl_to_tgsi_private.cpp', 'state_tracker/st_glsl_to_tgsi_private.h', 'state_tracker/st_glsl_to_tgsi_temprename.cpp', @@ -572,6 +585,7 @@ files_libmesa_gallium = files( 'state_tracker/st_mesa_to_tgsi.c', 'state_tracker/st_mesa_to_tgsi.h', 'state_tracker/st_nir.h', + 'state_tracker/st_nir_builtins.c', 'state_tracker/st_nir_lower_builtin.c', 'state_tracker/st_nir_lower_tex_src_plane.c', 'state_tracker/st_pbo.c', @@ -586,27 +600,16 @@ files_libmesa_gallium = files( 'state_tracker/st_shader_cache.h', 'state_tracker/st_texture.c', 'state_tracker/st_texture.h', + 'state_tracker/st_tgsi_lower_depth_clamp.c', + 'state_tracker/st_tgsi_lower_depth_clamp.h', 'state_tracker/st_tgsi_lower_yuv.c', 'state_tracker/st_tgsi_lower_yuv.h', + 'state_tracker/st_util.h', 'state_tracker/st_vdpau.c', 'state_tracker/st_vdpau.h', ) -matypes_h = [] -if with_asm_arch == 'x86' or with_asm_arch == 'x86_64' - gen_matypes = executable( - 'gen_matypes', - 'x86/gen_matypes.c', - c_args : [c_vis_args, c_msvc_compat_args], - include_directories : inc_common, - ) - matypes_h = custom_target( - 'matypes.h', - output : 'matypes.h', - command : [gen_matypes], - capture : true, - ) -endif +inc_libmesa_asm = [] if with_asm_arch == 'x86' files_libmesa_common += files( 'x86/assyntax.h', @@ -637,16 +640,24 @@ if with_asm_arch == 'x86' 'x86/sse_normal.S', 'x86/read_rgba_span_x86.S', ) + 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') + inc_libmesa_asm = include_directories('x86-64') +elif with_asm_arch == 'sparc' + files_libmesa_common += files( + 'sparc/sparc_clip.S', + 'sparc/norm.S', + 'sparc/xform.S', + ) + inc_libmesa_asm = include_directories('sparc') endif -# TODO: sparc format_fallback_c = custom_target( 'format_fallback.c', input : ['main/format_fallback.py', 'main/formats.csv'], output : 'format_fallback.c', - command : [prog_python2, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], + command : [prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@'], depend_files : files('main/format_parser.py'), ) @@ -654,7 +665,7 @@ get_hash_h = custom_target( 'get_hash.h', input : ['main/get_hash_generator.py', gl_and_es_api_files], output : 'get_hash.h', - command : [prog_python2, '@INPUT0@', '-f', '@INPUT1@'], + command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'], depend_files : files('main/get_hash_params.py'), capture : true, ) @@ -666,7 +677,7 @@ foreach x : [['format_info.h', 'format_info.py'], x[0], input : ['main/@0@'.format(x[1]), 'main/formats.csv'], output : x[0], - command : [prog_python2, '@INPUT0@', '@INPUT1@'], + command : [prog_python, '@INPUT0@', '@INPUT1@'], depend_files : files('main/format_parser.py'), capture : true, ) @@ -683,9 +694,11 @@ files_libmesa_common += [ main_marshal_generated_h, main_dispatch_h, ir_expression_operation_h, - nir_opcodes_h, main_remap_helper_h, - matypes_h, + sha1_h, +] +files_libmesa_gallium += [ + ir_expression_operation_h, sha1_h, ] @@ -700,23 +713,47 @@ else libmesa_sse41 = [] endif +_mesa_windows_args = [] +if with_platform_windows + _mesa_windows_args += [ + '-D_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers + '-DBUILD_GL32' # declare gl* as __declspec(dllexport) in Mesa headers + ] + if not with_shared_glapi + # prevent _glapi_* from being declared __declspec(dllimport) + _mesa_windows_args += '-D_GLAPI_NO_EXPORTS' + endif +endif + +libmesa_common = static_library( + 'mesa_common', + files_libmesa_common, + c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args], + cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args], + include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], + dependencies : idep_nir_headers, + build_by_default : false, +) + libmesa_classic = static_library( 'mesa_classic', - [files_libmesa_common, files_libmesa_classic], + files_libmesa_classic, c_args : [c_vis_args, c_msvc_compat_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common, include_directories('main')], - link_with : [libglsl, libmesa_sse41], + include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], + link_with : [libmesa_common, libglsl, libmesa_sse41], + dependencies : idep_nir_headers, build_by_default : false, ) libmesa_gallium = static_library( 'mesa_gallium', - [files_libmesa_common, files_libmesa_gallium], - c_args : [c_vis_args, c_msvc_compat_args], - cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common, include_directories('main')], - link_with : [libglsl, libmesa_sse41], + files_libmesa_gallium, + c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args], + cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args], + include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], + link_with : [libmesa_common, libglsl, libmesa_sse41], + dependencies : [idep_nir_headers, dep_vdpau], build_by_default : false, ) @@ -727,6 +764,6 @@ endif if with_glx == 'xlib' subdir('drivers/x11') endif -if with_tests +if with_tests and dri_drivers != [] subdir('main/tests') endif