Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 5200a244f269d2f26a024cd6d574924189e5a7f5..c89e635aab0d8fab2e94f11d9b8bb55876e4d7ee 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -53,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',
@@ -82,6 +83,7 @@ if env['platform'] != 'winddk':
                'main/pixelstore.c',
                'main/points.c',
                'main/polygon.c',
+               'main/querymatrix.c',
                'main/queryobj.c',
                'main/rastpos.c',
                'main/readpix.c',
@@ -105,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',
@@ -175,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',
@@ -220,31 +224,10 @@ if env['platform'] != 'winddk':
                'program/prog_statevars.c',
                'program/prog_uniform.c',
                'program/programopt.c',
+               'program/sampler.cpp',
                'program/symbol_table.c',
        ]
        
-       slang_sources = [
-               'slang/slang_builtin.c',
-               'slang/slang_codegen.c',
-               'slang/slang_compile.c',
-               'slang/slang_compile_function.c',
-               'slang/slang_compile_operation.c',
-               'slang/slang_compile_struct.c',
-               'slang/slang_compile_variable.c',
-               'slang/slang_emit.c',
-               'slang/slang_ir.c',
-               'slang/slang_label.c',
-               'slang/slang_link.c',
-               'slang/slang_log.c',
-               'slang/slang_mem.c',
-               'slang/slang_print.c',
-               'slang/slang_simplify.c',
-               'slang/slang_storage.c',
-               'slang/slang_typeinfo.c',
-               'slang/slang_vartable.c',
-               'slang/slang_utility.c',
-       ]
-       
        mesa_sources = (
                main_sources +
                math_sources +
@@ -329,8 +312,6 @@ if env['platform'] != 'winddk':
                # build dir) to the include path  
                env.Append(CPPPATH = [matypes[0].dir])
 
-       #SConscript('slang/library/SConscript')
-
        #
        # Libraries
        #