import filecmp
import os
import subprocess
+from sys import executable as python_cmd
env = env.Clone()
'#/src/mapi',
'#/src/glsl',
'#/src/mesa',
+ Dir('../mapi'), # src/mapi build path
+ Dir('.'), # src/mesa build path
])
-env.Append(CPPDEFINES = [
- 'FEATURE_GL=1',
-])
+enabled_apis = []
+enabled_apis += ['GL']
if env['platform'] == 'windows':
env.Append(CPPDEFINES = [
env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
else:
env.Append(CPPDEFINES = [
- 'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)
+ ('HAVE_DLOPEN', '1'),
])
#
'main/cpuinfo.c',
'main/debug.c',
'main/depth.c',
- 'main/depthstencil.c',
'main/dlist.c',
- 'main/dlopen.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/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/get.c',
'main/getstring.c',
+ 'main/glformats.c',
'main/hash.c',
+ 'main/hash_table.c',
'main/hint.c',
'main/histogram.c',
'main/image.c',
'main/mipmap.c',
'main/mm.c',
'main/multisample.c',
- 'main/nvprogram.c',
+ 'main/objectlabel.c',
'main/pack.c',
'main/pbo.c',
+ 'main/performance_monitor.c',
'main/pixel.c',
'main/pixelstore.c',
'main/pixeltransfer.c',
'main/renderbuffer.c',
'main/samplerobj.c',
'main/scissor.c',
+ 'main/set.c',
'main/shaderapi.c',
'main/shaderobj.c',
'main/shader_query.cpp',
'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/texgetimage.c',
'main/teximage.c',
'main/texobj.c',
- 'main/texpal.c',
'main/texparam.c',
'main/texstate.c',
'main/texstorage.c',
'main/vtxfmt.c',
]
+glget_sources = [
+ 'main/get.c',
+]
+
math_sources = [
'math/m_debug_clip.c',
'math/m_debug_norm.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_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',
'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',
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_stipple.c',
'state_tracker/st_atom_texture.c',
'state_tracker/st_atom_viewport.c',
- 'state_tracker/st_cb_accum.c',
'state_tracker/st_cb_bitmap.c',
'state_tracker/st_cb_blit.c',
'state_tracker/st_cb_bufferobjects.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_texture.c',
]
-env.Append(YACCFLAGS = '-d')
+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')
-# Make program/program_parse.tab.h reacheable from the include path
-env.Append(CPPPATH = [Dir('.').abspath])
-
program_sources = [
'program/arbprogparse.c',
- 'program/hash_table.c',
+ 'program/prog_hash_table.c',
'program/ir_to_mesa.cpp',
- 'program/nvfragparse.c',
- 'program/nvvertparse.c',
'program/program.c',
'program/program_parse_extra.c',
'program/prog_cache.c',
mesa_sources = (
main_sources +
+ glget_sources +
math_sources +
program_sources +
vbo_sources +
statetracker_sources
)
+GLAPI = '#src/mapi/glapi/'
+
if env['gles']:
- from sys import executable as python_cmd
-
- env.Append(CPPDEFINES = ['FEATURE_ES1=1', 'FEATURE_ES2=1'])
-
- # generate GLES sources
- gles_sources = []
- gles_sources += env.CodeGenerate(
- target = 'main/api_exec_es1.c',
- script = 'main/es_generator.py',
- source = 'main/APIspec.xml',
- command = python_cmd + ' $SCRIPT -S $SOURCE -V GLES1.1 > $TARGET'
- )
- gles_sources += env.CodeGenerate(
- target = 'main/api_exec_es2.c',
- script = 'main/es_generator.py',
- source = 'main/APIspec.xml',
- command = python_cmd + ' $SCRIPT -S $SOURCE -V GLES2.0 > $TARGET'
- )
-
- # generate GLES headers
- GLAPI = '#src/mapi/glapi/'
- gles_headers = []
- gles_headers += env.CodeGenerate(
- target = 'main/api_exec_es1_dispatch.h',
- script = GLAPI + 'gen/gl_table.py',
- 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 = 'main/api_exec_es1_remap_helper.h',
- script = GLAPI + 'gen/remap_helper.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
- command = python_cmd + ' $SCRIPT -c es1 -f $SOURCE > $TARGET',
- )
- gles_headers += env.CodeGenerate(
- target = 'main/api_exec_es2_dispatch.h',
- script = GLAPI + 'gen/gl_table.py',
- 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 = 'main/api_exec_es2_remap_helper.h',
- script = GLAPI + 'gen/remap_helper.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
- command = python_cmd + ' $SCRIPT -c es2 -f $SOURCE > $TARGET',
- )
-
- env.Depends(gles_sources, gles_headers)
-
- # gles_sources #include gles_headers with full path
- env.Append(CPPPATH = [gles_headers[0].dir.up().up()])
-
- mesa_sources += gles_sources
+
+ enabled_apis += ['ES1', 'ES2']
+
+get_hash_header = env.CodeGenerate(
+ target = 'main/get_hash.h',
+ script = 'main/get_hash_generator.py',
+ source = GLAPI + 'gen/gl_and_es_API.xml',
+ command = python_cmd + ' $SCRIPT ' + ' -f $SOURCE > $TARGET'
+)
#
# Assembly sources
#
-if env['gcc'] and env['platform'] != 'windows':
+if (env['gcc'] or env['clang']) and \
+ env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
if env['machine'] == 'x86':
env.Append(CPPDEFINES = [
'USE_X86_ASM',
'x86-64/x86-64.c',
'x86-64/xform4.S',
]
- elif env['machine'] == 'ppc':
- env.Append(CPPDEFINES = [
- 'USE_PPC_ASM',
- 'USE_VMX_ASM',
- ])
- mesa_sources += [
- 'ppc/common_ppc.c',
- ]
elif env['machine'] == 'sparc':
mesa_sources += [
'sparc/sparc.c',
- 'sparc/clip.S',
+ 'sparc/sparc_clip.S',
'sparc/norm.S',
'sparc/xform.S',
]
env.Append(CPPPATH = [matypes[0].dir])
-
-
def write_git_sha1_h_file(filename):
"""Mesa looks for a git_sha1.h file at compile time in order to display
the current git hash id in the GL_VERSION string. This function tries
projects / mesa.git / blobdiff