X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FSConscript;h=0f1543802b9448ae000c089e0ab5fae6c8ed505d;hb=173666e2ed7ed71ae7aafa1780aa44d90ef7cb4a;hp=dfc8bd4410a22495af561d48d7f3f90e1bde71f7;hpb=730952aa12c257af25af0873e0b284f742fb485e;p=mesa.git diff --git a/src/mesa/SConscript b/src/mesa/SConscript index dfc8bd4410a..0f1543802b9 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -3,6 +3,10 @@ Import('*') +import filecmp +import os +import subprocess +from sys import executable as python_cmd env = env.Clone() @@ -10,11 +14,12 @@ env.Append(CPPPATH = [ '#/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 = [ @@ -26,7 +31,7 @@ if env['platform'] == 'windows': env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS']) else: env.Append(CPPDEFINES = [ - 'IN_DRI_DRIVER', # enable the remap table (for DRI drivers) + ('HAVE_DLOPEN', '1'), ]) # @@ -37,7 +42,6 @@ main_sources = [ 'main/api_arrayelt.c', 'main/api_exec.c', 'main/api_loopback.c', - 'main/api_noop.c', 'main/api_validate.c', 'main/accum.c', 'main/arbprogram.c', @@ -56,13 +60,13 @@ main_sources = [ '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', @@ -71,12 +75,15 @@ main_sources = [ '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', @@ -87,7 +94,6 @@ main_sources = [ 'main/mipmap.c', 'main/mm.c', 'main/multisample.c', - 'main/nvprogram.c', 'main/pack.c', 'main/pbo.c', 'main/pixel.c', @@ -103,29 +109,33 @@ main_sources = [ 'main/renderbuffer.c', 'main/samplerobj.c', 'main/scissor.c', + 'main/set.c', 'main/shaderapi.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/texfetch.c', 'main/texformat.c', 'main/texgen.c', 'main/texgetimage.c', 'main/teximage.c', 'main/texobj.c', - 'main/texpal.c', 'main/texparam.c', 'main/texstate.c', + 'main/texstorage.c', 'main/texstore.c', 'main/texturebarrier.c', 'main/transformfeedback.c', + 'main/uniform_query.cpp', 'main/uniforms.c', 'main/varray.c', 'main/version.c', @@ -133,6 +143,10 @@ main_sources = [ 'main/vtxfmt.c', ] +glget_sources = [ + 'main/get.c', +] + math_sources = [ 'math/m_debug_clip.c', 'math/m_debug_norm.c', @@ -144,14 +158,9 @@ math_sources = [ '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', @@ -169,10 +178,11 @@ swrast_sources = [ 'swrast/s_logic.c', 'swrast/s_masking.c', 'swrast/s_points.c', - 'swrast/s_readpix.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', @@ -212,6 +222,8 @@ vbo_sources = [ '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', @@ -224,6 +236,7 @@ vbo_sources = [ 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', @@ -238,7 +251,6 @@ statetracker_sources = [ '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', @@ -250,6 +262,7 @@ statetracker_sources = [ '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', @@ -274,20 +287,15 @@ statetracker_sources = [ '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', @@ -300,10 +308,10 @@ program_sources = [ 'program/prog_parameter_layout.c', 'program/prog_print.c', 'program/prog_statevars.c', - 'program/prog_uniform.c', 'program/programopt.c', 'program/sampler.cpp', 'program/symbol_table.c', + 'program/string_to_uint_map.cpp', program_lex, program_parse[0], ] @@ -315,8 +323,8 @@ common_driver_sources = [ mesa_sources = ( main_sources + + glget_sources + math_sources + - math_xform_sources + program_sources + vbo_sources + tnl_sources + @@ -326,65 +334,24 @@ mesa_sources = ( statetracker_sources ) -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', - ) +GLAPI = '#src/mapi/glapi/' - env.Depends(gles_sources, gles_headers) +if env['gles']: - # gles_sources #include gles_headers with full path - env.Append(CPPPATH = [gles_headers[0].dir.up().up()]) + enabled_apis += ['ES1', 'ES2'] - mesa_sources += gles_sources +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', @@ -423,18 +390,10 @@ if env['gcc'] and env['platform'] != 'windows': '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', ] @@ -458,13 +417,56 @@ if env['gcc'] and env['platform'] != 'windows': 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') +# The enums.c file is generated from the GL/ES API.xml file +env.CodeGenerate( + target = 'main/enums.c', + script = GLAPI + 'gen/gl_enums.py', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' + ) + +# The api_exec.c file is generated from the GL/ES API.xml file +env.CodeGenerate( + target = 'main/api_exec.c', + script = GLAPI + 'gen/gl_genexec.py', + source = GLAPI + 'gen/gl_and_es_API.xml', + command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' + ) + + +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 + to retrieve the git hashid and write the header file. An empty file + will be created if anything goes wrong.""" + + args = [ 'git', 'log', '-n', '1', '--oneline' ] + try: + (commit, foo) = subprocess.Popen(args, stdout=subprocess.PIPE).communicate() + except: + # git log command didn't work + if not os.path.exists(filename): + # create an empty file if none already exists + f = open(filename, "w") + f.close() + return + + commit = '#define MESA_GIT_SHA1 "git-%s"\n' % commit[0:7] + tempfile = "git_sha1.h.tmp" + f = open(tempfile, "w") + f.write(commit) f.close() + if not os.path.exists(filename) or not filecmp.cmp(tempfile, filename): + # The filename does not exist or it's different from the new file, + # so replace old file with new. + if os.path.exists(filename): + os.remove(filename) + os.rename(tempfile, filename) + return + + +# Create the git_sha1.h header file +write_git_sha1_h_file("main/git_sha1.h") # and update CPPPATH so the git_sha1.h header can be found env.Append(CPPPATH = ["#" + env['build_dir'] + "/mesa/main"])