X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmeson.build;h=2d9b673fbe73e32bdc27db9ed5722b243bf01fa2;hb=205f960e08d7b13ea529782e0e744c657bf1771f;hp=846a40da82293490a3c3665de34d492332ce0b1d;hpb=43a6e84927e3b1290f6f211f5dfb184dfe5a719e;p=mesa.git diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 846a40da822..2d9b673fbe7 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -18,16 +18,9 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# TODO: main/tests -# TODO: xlib_glx -# TODO: osmesa -# TODO: asm_offsets - subdir('program') subdir('main') -# program files -# program nir files # files shared between classic mesa and gallium mesa files_libmesa_common = files( 'program/arbprogparse.c', @@ -70,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', @@ -105,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', @@ -123,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', @@ -167,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', @@ -193,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', @@ -220,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', @@ -255,6 +256,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', @@ -328,9 +331,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', @@ -340,16 +341,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', ) @@ -368,6 +364,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', @@ -487,7 +488,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', @@ -537,6 +537,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', @@ -563,9 +565,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', @@ -577,6 +583,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', @@ -593,13 +600,11 @@ files_libmesa_gallium = files( 'state_tracker/st_texture.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', ) -# TODO: sse41 -libmesa_sse41 = [] - matypes_h = [] if with_asm_arch == 'x86' or with_asm_arch == 'x86_64' gen_matypes = executable( @@ -615,6 +620,8 @@ if with_asm_arch == 'x86' or with_asm_arch == 'x86_64' capture : true, ) endif + +inc_libmesa_asm = [] if with_asm_arch == 'x86' files_libmesa_common += files( 'x86/assyntax.h', @@ -645,16 +652,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'), ) @@ -662,7 +677,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, ) @@ -674,7 +689,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, ) @@ -691,19 +706,30 @@ 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, ] +if with_sse41 + libmesa_sse41 = static_library( + 'mesa_sse41', + files('main/streaming-load-memcpy.c', 'main/sse_minmax.c'), + c_args : [c_vis_args, c_msvc_compat_args, sse41_args], + include_directories : inc_common, + ) +else + libmesa_sse41 = [] +endif + libmesa_classic = static_library( 'mesa_classic', [files_libmesa_common, 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')], + include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], link_with : [libglsl, libmesa_sse41], + dependencies : idep_nir_headers, build_by_default : false, ) @@ -712,12 +738,19 @@ libmesa_gallium = static_library( [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')], + include_directories : [inc_common, inc_libmesa_asm, include_directories('main')], link_with : [libglsl, libmesa_sse41], + dependencies : [idep_nir_headers, dep_vdpau], build_by_default : false, ) subdir('drivers/dri') -if with_tests +if with_osmesa == 'classic' + subdir('drivers/osmesa') +endif +if with_glx == 'xlib' + subdir('drivers/x11') +endif +if with_tests and dri_drivers != [] subdir('main/tests') endif