mesa/SConscript: Use Makefile.sources instead of duplicating the file lists

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index f4904fbbd3dd90d37ceddd2dae0616ffb10be95d..fdfb2d2ad06a810ebfe49d67c99600b474922cab 100644 (file)
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -3,6 +3,9 @@
 # This file is among different build systems. SRCDIR must be defined with
 # a trailing slash because the Android build system leaves it undefined.
 
+SRCDIR = $(top_srcdir)/src/mesa/
+BUILDDIR = $(top_builddir)/src/mesa/
+
 # this is part of MAIN_FILES
 MAIN_ES_FILES = \
        $(SRCDIR)main/es1_conversion.c

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index f56578672a640b289687e7b4fe4d8650fb77bcde..fbfacccd32f068f8efb8b759ac8ea05152e60823 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -31,316 +31,22 @@ else:
         ('HAVE_DLOPEN', '1'),
     ])
 
-#
-# Source files
-#
-
-main_sources = [
-    'main/api_arrayelt.c',
-    'main/api_exec.c',
-    'main/api_loopback.c',
-    'main/api_validate.c',
-    'main/accum.c',
-    'main/arbprogram.c',
-    'main/atifragshader.c',
-    'main/attrib.c',
-    'main/arrayobj.c',
-    'main/blend.c',
-    'main/blit.c',
-    'main/bufferobj.c',
-    'main/buffers.c',
-    'main/clear.c',
-    'main/clip.c',
-    'main/colortab.c',
-    'main/compute.c',
-    'main/condrender.c',
-    'main/context.c',
-    'main/convolve.c',
-    'main/cpuinfo.c',
-    'main/debug.c',
-    'main/depth.c',
-    'main/dlist.c',
-    'main/drawpix.c',
-    'main/drawtex.c',
-    'main/enable.c',
-    'main/enums.c',
-    'main/errors.c',
-    'main/es1_conversion.c',
-    'main/eval.c',
-    'main/execmem.c',
-    'main/extensions.c',
-    'main/fbobject.c',
-    'main/feedback.c',
-    'main/ff_fragment_shader.cpp',
-    'main/ffvertex_prog.c',
-    'main/fog.c',
-    'main/formatquery.c',
-    'main/formats.c',
-    'main/format_pack.c',
-    'main/format_unpack.c',
-    'main/framebuffer.c',
-    'main/genmipmap.c',
-    'main/getstring.c',
-    'main/glformats.c',
-    'main/hash.c',
-    'main/hash_table.c',
-    'main/hint.c',
-    'main/histogram.c',
-    'main/image.c',
-    'main/imports.c',
-    'main/light.c',
-    'main/lines.c',
-    'main/matrix.c',
-    'main/mipmap.c',
-    'main/mm.c',
-    'main/multisample.c',
-    'main/objectlabel.c',
-    'main/pack.c',
-    'main/pbo.c',
-    'main/performance_monitor.c',
-    'main/pipelineobj.c',
-    'main/pixel.c',
-    'main/pixelstore.c',
-    'main/pixeltransfer.c',
-    'main/points.c',
-    'main/polygon.c',
-    'main/querymatrix.c',
-    'main/queryobj.c',
-    'main/rastpos.c',
-    'main/readpix.c',
-    'main/remap.c',
-    'main/renderbuffer.c',
-    'main/samplerobj.c',
-    'main/scissor.c',
-    'main/set.c',
-    'main/shaderapi.c',
-    'main/shaderimage.c',
-    'main/shaderobj.c',
-    'main/shader_query.cpp',
-    'main/shared.c',
-    'main/state.c',
-    'main/stencil.c',
-    'main/syncobj.c',
-    'main/texcompress.c',
-    'main/texcompress_cpal.c',
-    'main/texcompress_rgtc.c',
-    'main/texcompress_s3tc.c',
-    'main/texcompress_fxt1.c',
-    'main/texcompress_etc.c',
-    'main/texenv.c',
-    'main/texformat.c',
-    'main/texgen.c',
-    'main/texgetimage.c',
-    'main/teximage.c',
-    'main/texobj.c',
-    'main/texparam.c',
-    'main/texstate.c',
-    'main/texstorage.c',
-    'main/texstore.c',
-    'main/texturebarrier.c',
-    'main/textureview.c',
-    'main/transformfeedback.c',
-    'main/uniform_query.cpp',
-    'main/uniforms.c',
-    'main/varray.c',
-    'main/vdpau.c',
-    'main/version.c',
-    'main/viewport.c',
-    'main/vtxfmt.c',
-]
-
-glget_sources = [
-    'main/get.c',
-]
-
-math_sources = [
-    'math/m_debug_clip.c',
-    'math/m_debug_norm.c',
-    'math/m_debug_xform.c',
-    'math/m_eval.c',
-    'math/m_matrix.c',
-    'math/m_translate.c',
-    'math/m_vector.c',
-    'math/m_xform.c',
-]
-
-swrast_sources = [
-    'swrast/s_aaline.c',
-    'swrast/s_aatriangle.c',
-    'swrast/s_alpha.c',
-    'swrast/s_atifragshader.c',
-    'swrast/s_bitmap.c',
-    'swrast/s_blend.c',
-    'swrast/s_blit.c',
-    'swrast/s_clear.c',
-    'swrast/s_copypix.c',
-    'swrast/s_context.c',
-    'swrast/s_depth.c',
-    'swrast/s_drawpix.c',
-    'swrast/s_feedback.c',
-    'swrast/s_fog.c',
-    'swrast/s_fragprog.c',
-    'swrast/s_lines.c',
-    'swrast/s_logic.c',
-    'swrast/s_masking.c',
-    'swrast/s_points.c',
-    'swrast/s_renderbuffer.c',
-    'swrast/s_span.c',
-    'swrast/s_stencil.c',
-    'swrast/s_texcombine.c',
-    'swrast/s_texfetch.c',
-    'swrast/s_texfilter.c',
-    'swrast/s_texrender.c',
-    'swrast/s_texture.c',
-    'swrast/s_triangle.c',
-    'swrast/s_zoom.c',
-]
-
-swrast_setup_sources = [
-    'swrast_setup/ss_context.c',
-    'swrast_setup/ss_triangle.c',
-]
-
-tnl_sources = [
-    'tnl/t_context.c',
-    'tnl/t_pipeline.c',
-    'tnl/t_draw.c',
-    'tnl/t_rasterpos.c',
-    'tnl/t_vb_program.c',
-    'tnl/t_vb_render.c',
-    'tnl/t_vb_texgen.c',
-    'tnl/t_vb_texmat.c',
-    'tnl/t_vb_vertex.c',
-    'tnl/t_vb_fog.c',
-    'tnl/t_vb_light.c',
-    'tnl/t_vb_normals.c',
-    'tnl/t_vb_points.c',
-    'tnl/t_vp_build.c',
-    'tnl/t_vertex.c',
-    'tnl/t_vertex_sse.c',
-    'tnl/t_vertex_generic.c',
-]
-
-vbo_sources = [
-    'vbo/vbo_context.c',
-    'vbo/vbo_exec.c',
-    'vbo/vbo_exec_api.c',
-    'vbo/vbo_exec_array.c',
-    'vbo/vbo_exec_draw.c',
-    'vbo/vbo_exec_eval.c',
-    'vbo/vbo_noop.c',
-    'vbo/vbo_primitive_restart.c',
-    'vbo/vbo_rebase.c',
-    'vbo/vbo_split.c',
-    'vbo/vbo_split_copy.c',
-    'vbo/vbo_split_inplace.c',
-    'vbo/vbo_save.c',
-    'vbo/vbo_save_api.c',
-    'vbo/vbo_save_draw.c',
-    'vbo/vbo_save_loopback.c',
-]
-
-statetracker_sources = [
-    'state_tracker/st_atom.c',
-    'state_tracker/st_atom_array.c',
-    'state_tracker/st_atom_blend.c',
-    'state_tracker/st_atom_clip.c',
-    'state_tracker/st_atom_constbuf.c',
-    'state_tracker/st_atom_depth.c',
-    'state_tracker/st_atom_framebuffer.c',
-    'state_tracker/st_atom_msaa.c',
-    'state_tracker/st_atom_pixeltransfer.c',
-    'state_tracker/st_atom_sampler.c',
-    'state_tracker/st_atom_scissor.c',
-    'state_tracker/st_atom_shader.c',
-    'state_tracker/st_atom_rasterizer.c',
-    'state_tracker/st_atom_stipple.c',
-    'state_tracker/st_atom_texture.c',
-    'state_tracker/st_atom_viewport.c',
-    'state_tracker/st_cb_bitmap.c',
-    'state_tracker/st_cb_blit.c',
-    'state_tracker/st_cb_bufferobjects.c',
-    'state_tracker/st_cb_clear.c',
-    'state_tracker/st_cb_condrender.c',
-    'state_tracker/st_cb_flush.c',
-    'state_tracker/st_cb_drawpixels.c',
-    'state_tracker/st_cb_drawtex.c',
-    'state_tracker/st_cb_eglimage.c',
-    'state_tracker/st_cb_fbo.c',
-    'state_tracker/st_cb_feedback.c',
-    'state_tracker/st_cb_msaa.c',
-    'state_tracker/st_cb_program.c',
-    'state_tracker/st_cb_queryobj.c',
-    'state_tracker/st_cb_rasterpos.c',
-    'state_tracker/st_cb_readpixels.c',
-    'state_tracker/st_cb_syncobj.c',
-    'state_tracker/st_cb_strings.c',
-    'state_tracker/st_cb_texture.c',
-    'state_tracker/st_cb_texturebarrier.c',
-    'state_tracker/st_cb_viewport.c',
-    'state_tracker/st_cb_xformfb.c',
-    'state_tracker/st_context.c',
-    'state_tracker/st_debug.c',
-    'state_tracker/st_draw.c',
-    'state_tracker/st_draw_feedback.c',
-    'state_tracker/st_extensions.c',
-    'state_tracker/st_format.c',
-    'state_tracker/st_glsl_to_tgsi.cpp',
-    'state_tracker/st_gen_mipmap.c',
-    'state_tracker/st_manager.c',
-    'state_tracker/st_mesa_to_tgsi.c',
-    'state_tracker/st_program.c',
-    'state_tracker/st_texture.c',
-    'state_tracker/st_vdpau.c',
-]
+# parse Makefile.sources
+source_lists = env.ParseSourceList('Makefile.sources')
 
 env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
 program_lex = env.CFile('program/lex.yy.c', 'program/program_lexer.l')
 program_parse = env.CFile('program/program_parse.tab.c',
                           'program/program_parse.y')
-
-program_sources = [
-    'program/arbprogparse.c',
-    'program/prog_hash_table.c',
-    'program/ir_to_mesa.cpp',
-    'program/program.c',
-    'program/program_parse_extra.c',
-    'program/prog_cache.c',
-    'program/prog_execute.c',
-    'program/prog_instruction.c',
-    'program/prog_noise.c',
-    'program/prog_optimize.c',
-    'program/prog_opt_constant_fold.c',
-    'program/prog_parameter.c',
-    'program/prog_parameter_layout.c',
-    'program/prog_print.c',
-    'program/prog_statevars.c',
-    'program/programopt.c',
-    'program/sampler.cpp',
-    'program/symbol_table.c',
-    'program/string_to_uint_map.cpp',
+program_sources = source_lists['PROGRAM_FILES'] + [
     program_lex,
     program_parse[0],
 ]
 
-common_driver_sources =        [
-    'drivers/common/driverfuncs.c',
-    'drivers/common/meta.c',
-    'drivers/common/meta_blit.c',
-    'drivers/common/meta_generate_mipmap.c'
-]
-
 mesa_sources = (
-    main_sources +
-    glget_sources +
-    math_sources +
+    source_lists['MESA_FILES'] +
     program_sources +
-    vbo_sources +
-    tnl_sources +
-    swrast_sources +
-    swrast_setup_sources +
-    common_driver_sources +
-    statetracker_sources
+    source_lists['STATETRACKER_FILES']
 )
 
 GLAPI = '#src/mapi/glapi/'
@@ -364,45 +70,14 @@ if (env['gcc'] or env['clang']) and \
             'USE_3DNOW_ASM',
             'USE_SSE_ASM',
         ])
-        mesa_sources += [
-            'x86/common_x86.c',
-            'x86/x86_xform.c',
-            'x86/3dnow.c',
-            'x86/sse.c',
-            'x86/common_x86_asm.S',
-            'x86/x86_xform2.S',
-            'x86/x86_xform3.S',
-            'x86/x86_xform4.S',
-            'x86/x86_cliptest.S',
-            'x86/mmx_blend.S',
-            'x86/3dnow_xform1.S',
-            'x86/3dnow_xform2.S',
-            'x86/3dnow_xform3.S',
-            'x86/3dnow_xform4.S',
-            'x86/3dnow_normal.S',
-            'x86/sse_xform1.S',
-            'x86/sse_xform2.S',
-            'x86/sse_xform3.S',
-            'x86/sse_xform4.S',
-            'x86/sse_normal.S',
-            'x86/read_rgba_span_x86.S',
-        ]
+        mesa_sources += source_lists['X86_FILES']
     elif env['machine'] == 'x86_64':
         env.Append(CPPDEFINES = [
             'USE_X86_64_ASM',
         ])
-        mesa_sources += [
-            'x86/common_x86.c',
-            'x86-64/x86-64.c',
-            'x86-64/xform4.S',
-        ]
+        mesa_sources += source_lists['X86_64_FILES']
     elif env['machine'] == 'sparc':
-        mesa_sources += [
-            'sparc/sparc.c',
-            'sparc/sparc_clip.S',
-            'sparc/norm.S',
-            'sparc/xform.S',
-        ]
+        mesa_sources += source_lists['SPARC_FILES']
     else:
         pass