'main/readpix.c',
'main/remap.c',
'main/renderbuffer.c',
+ 'main/samplerobj.c',
'main/scissor.c',
'main/shaderapi.c',
'main/shaderobj.c',
'main/texobj.c',
'main/texpal.c',
'main/texparam.c',
- 'main/texrender.c',
'main/texstate.c',
'main/texstore.c',
'main/texturebarrier.c',
'math/m_xform.c',
]
+math_xform_sources = [
+ 'math/m_xform.c'
+]
+
+swrast_sources = [
+ 'swrast/s_aaline.c',
+ 'swrast/s_aatriangle.c',
+ 'swrast/s_accum.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_readpix.c',
+ 'swrast/s_span.c',
+ 'swrast/s_stencil.c',
+ 'swrast/s_texcombine.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_save_loopback.c',
]
-vf_sources = [
- 'vf/vf.c',
- 'vf/vf_generic.c',
- 'vf/vf_sse.c',
-]
-
statetracker_sources = [
'state_tracker/st_atom.c',
'state_tracker/st_atom_blend.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',
'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_parse[0],
]
+common_driver_sources = [
+ 'drivers/common/driverfuncs.c',
+ 'drivers/common/meta.c',
+]
+
mesa_sources = (
main_sources +
math_sources +
+ math_xform_sources +
program_sources +
vbo_sources +
- vf_sources +
+ tnl_sources +
+ swrast_sources +
+ swrast_setup_sources +
+ common_driver_sources +
statetracker_sources
)
GLAPI = '#src/mapi/glapi/'
gles_headers = []
gles_headers += env.CodeGenerate(
- target = 'es1api/main/glapidispatch.h',
+ target = 'main/api_exec_es1_dispatch.h',
script = GLAPI + 'gen/gl_table.py',
- source = GLAPI + 'gen-es/es1_API.xml',
- command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET',
+ source = GLAPI + 'gen/gl_and_es_API.xml',
+ command = python_cmd + ' $SCRIPT -c es1 -m remap_table -f $SOURCE > $TARGET',
)
gles_headers += env.CodeGenerate(
- target = 'es1api/main/remap_helper.h',
+ target = 'main/api_exec_es1_remap_helper.h',
script = GLAPI + 'gen/remap_helper.py',
- source = GLAPI + 'gen-es/es1_API.xml',
- command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET',
+ source = GLAPI + 'gen/gl_and_es_API.xml',
+ command = python_cmd + ' $SCRIPT -c es1 -f $SOURCE > $TARGET',
)
gles_headers += env.CodeGenerate(
- target = 'es2api/main/glapidispatch.h',
+ target = 'main/api_exec_es2_dispatch.h',
script = GLAPI + 'gen/gl_table.py',
- source = GLAPI + 'gen-es/es2_API.xml',
- command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET',
+ source = GLAPI + 'gen/gl_and_es_API.xml',
+ command = python_cmd + ' $SCRIPT -c es2 -m remap_table -f $SOURCE > $TARGET',
)
gles_headers += env.CodeGenerate(
- target = 'es2api/main/remap_helper.h',
+ target = 'main/api_exec_es2_remap_helper.h',
script = GLAPI + 'gen/remap_helper.py',
- source = GLAPI + 'gen-es/es2_API.xml',
- command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET',
+ source = GLAPI + 'gen/gl_and_es_API.xml',
+ command = python_cmd + ' $SCRIPT -c es2 -f $SOURCE > $TARGET',
)
env.Depends(gles_sources, gles_headers)
env.Append(CPPPATH = [matypes[0].dir])
- # Create the git_sha1.h file if it doesn't exist already
- try:
- f = open('main/git_sha1.h', 'r')
- f.close()
- except IOError:
- f = open('main/git_sha1.h', 'w')
- f.close()
- # and update CPPPATH so the git_sha1.h header can be found
- env.Append(CPPPATH = ["#" + env['build_dir'] + "/mesa/main"])
+# Create the git_sha1.h file if it doesn't exist already
+try:
+ f = open('main/git_sha1.h', 'r')
+ f.close()
+except IOError:
+ f = open('main/git_sha1.h', 'w')
+ f.close()
+# and update CPPPATH so the git_sha1.h header can be found
+env.Append(CPPPATH = ["#" + env['build_dir'] + "/mesa/main"])
#
env.Alias('mesa', mesa)
Export('mesa')
+
+SConscript('drivers/SConscript')