X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FSConscript;h=f56578672a640b289687e7b4fe4d8650fb77bcde;hb=ccda1b9ba92d6644a61e646908a8c6e55e310f2e;hp=da4d9b1857adce102e182e05e822387642de0b37;hpb=b85284f45e8b05ba9a0dac8dd95a9c078e4a635e;p=mesa.git

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index da4d9b1857a..f56578672a6 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -6,6 +6,7 @@ Import('*')
 import filecmp
 import os
 import subprocess
+from sys import executable as python_cmd
 
 env = env.Clone()
 
@@ -13,10 +14,8 @@ env.Append(CPPPATH = [
     '#/src/mapi',
     '#/src/glsl',
     '#/src/mesa',
-])
-
-env.Append(CPPDEFINES = [
-    'FEATURE_GL=1',
+    Dir('../mapi'), # src/mapi build path
+    Dir('.'), # src/mesa build path
 ])
 
 if env['platform'] == 'windows':
@@ -29,7 +28,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'),
     ])
 
 #
@@ -47,24 +46,26 @@ main_sources = [
     '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/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',
@@ -73,13 +74,16 @@ 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/genmipmap.c',
     'main/getstring.c',
+    'main/glformats.c',
     'main/hash.c',
+    'main/hash_table.c',
     'main/hint.c',
     'main/histogram.c',
     'main/image.c',
@@ -90,9 +94,11 @@ main_sources = [
     '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/pipelineobj.c',
     'main/pixel.c',
     'main/pixelstore.c',
     'main/pixeltransfer.c',
@@ -106,7 +112,9 @@ main_sources = [
     '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',
@@ -114,6 +122,7 @@ main_sources = [
     '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',
@@ -124,21 +133,26 @@ main_sources = [
     '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/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',
@@ -215,6 +229,7 @@ vbo_sources = [
     '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',
@@ -227,6 +242,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',
@@ -252,6 +268,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,22 +291,18 @@ statetracker_sources = [
     'state_tracker/st_mesa_to_tgsi.c',
     'state_tracker/st_program.c',
     'state_tracker/st_texture.c',
+    'state_tracker/st_vdpau.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',
@@ -313,10 +326,13 @@ program_sources = [
 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 +
     program_sources +
     vbo_sources +
@@ -327,65 +343,20 @@ 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',
-    )
-
-    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
+GLAPI = '#src/mapi/glapi/'
+
+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',
@@ -421,21 +392,14 @@ if env['gcc'] and env['platform'] != 'windows':
             'USE_X86_64_ASM',
         ])
         mesa_sources += [
+            'x86/common_x86.c',
             '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',
         ]
@@ -459,8 +423,6 @@ if env['gcc'] and env['platform'] != 'windows':
         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