Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 8899610dd3e389a5eaee2fa3d5a5b29aee4d0c24..c89e635aab0d8fab2e94f11d9b8bb55876e4d7ee 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -10,6 +10,7 @@ if env['platform'] != 'winddk':
        
        env.Append(CPPPATH = [
                '#/src/mapi',
+               '#/src/glsl',
                '#/src/mesa',
        ])
        
@@ -19,6 +20,7 @@ if env['platform'] != 'winddk':
                        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 
                        'WIN32_THREADS', # use Win32 thread API
                ])       
+        env.Prepend(CPPPATH = ['#src/talloc'])
 
        #
        # Source files
@@ -31,6 +33,7 @@ if env['platform'] != 'winddk':
                'main/api_noop.c',
                'main/api_validate.c',
                'main/accum.c',
+               'main/arbprogram.c',
                'main/atifragshader.c',
                'main/attrib.c',
                'main/arrayobj.c',
@@ -50,6 +53,7 @@ if env['platform'] != 'winddk':
                'main/dlist.c',
                'main/dlopen.c',
                'main/drawpix.c',
+               'main/drawtex.c',
                'main/enable.c',
                'main/enums.c',
                'main/eval.c',
@@ -74,10 +78,12 @@ if env['platform'] != 'winddk':
                'main/mipmap.c',
                'main/mm.c',
                'main/multisample.c',
+               'main/nvprogram.c',
                'main/pixel.c',
                'main/pixelstore.c',
                'main/points.c',
                'main/polygon.c',
+               'main/querymatrix.c',
                'main/queryobj.c',
                'main/rastpos.c',
                'main/readpix.c',
@@ -101,6 +107,7 @@ if env['platform'] != 'winddk':
                'main/texgetimage.c',
                'main/teximage.c',
                'main/texobj.c',
+               'main/texpal.c',
                'main/texparam.c',
                'main/texrender.c',
                'main/texstate.c',
@@ -171,6 +178,7 @@ if env['platform'] != 'winddk':
                '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',
@@ -195,61 +203,38 @@ if env['platform'] != 'winddk':
                'state_tracker/st_texture.c',
        ]
        
-       shader_sources = [
-               'shader/arbprogparse.c',
-               'shader/arbprogram.c',
-               'shader/hash_table.c',
-               'shader/lex.yy.c',
-               'shader/nvfragparse.c',
-               'shader/nvprogram.c',
-               'shader/nvvertparse.c',
-               'shader/program.c',
-               'shader/program_parse.tab.c',
-               'shader/program_parse_extra.c',
-               'shader/prog_cache.c',
-               'shader/prog_execute.c',
-               'shader/prog_instruction.c',
-               'shader/prog_noise.c',
-               'shader/prog_optimize.c',
-               'shader/prog_parameter.c',
-               'shader/prog_parameter_layout.c',
-               'shader/prog_print.c',
-               'shader/prog_statevars.c',
-               'shader/prog_uniform.c',
-               'shader/programopt.c',
-               'shader/symbol_table.c',
-       ]
-       
-       slang_sources = [
-               'shader/slang/slang_builtin.c',
-               'shader/slang/slang_codegen.c',
-               'shader/slang/slang_compile.c',
-               'shader/slang/slang_compile_function.c',
-               'shader/slang/slang_compile_operation.c',
-               'shader/slang/slang_compile_struct.c',
-               'shader/slang/slang_compile_variable.c',
-               'shader/slang/slang_emit.c',
-               'shader/slang/slang_ir.c',
-               'shader/slang/slang_label.c',
-               'shader/slang/slang_link.c',
-               'shader/slang/slang_log.c',
-               'shader/slang/slang_mem.c',
-               'shader/slang/slang_print.c',
-               'shader/slang/slang_simplify.c',
-               'shader/slang/slang_storage.c',
-               'shader/slang/slang_typeinfo.c',
-               'shader/slang/slang_vartable.c',
-               'shader/slang/slang_utility.c',
+       program_sources = [
+               'program/arbprogparse.c',
+               'program/hash_table.c',
+        'program/ir_to_mesa.cpp',
+               'program/lex.yy.c',
+               'program/nvfragparse.c',
+               'program/nvvertparse.c',
+               'program/program.c',
+               'program/program_parse.tab.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_parameter.c',
+               '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',
        ]
        
        mesa_sources = (
                main_sources +
                math_sources +
+               program_sources +
                vbo_sources +
                vf_sources +
-               statetracker_sources +
-               shader_sources +
-               slang_sources
+               statetracker_sources
        )
 
        #
@@ -327,8 +312,6 @@ if env['platform'] != 'winddk':
                # build dir) to the include path  
                env.Append(CPPPATH = [matypes[0].dir])
 
-       SConscript('shader/slang/library/SConscript')
-
        #
        # Libraries
        #