Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa

[mesa.git] / src / mesa / sources.mak

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index d1c109c2c5995bd2ef4476c5aa8a8ac22d04bb38..7107538cee732c20d5767c143f77aa34f7cc22be 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -61,6 +61,7 @@ MAIN_SOURCES = \
        main/shared.c \
        main/state.c \
        main/stencil.c \
+       main/syncobj.c \
        main/texcompress.c \
        main/texcompress_s3tc.c \
        main/texcompress_fxt1.c \
@@ -114,7 +115,6 @@ SWRAST_SOURCES = \
        swrast/s_feedback.c \
        swrast/s_fog.c \
        swrast/s_fragprog.c \
-       swrast/s_imaging.c \
        swrast/s_lines.c \
        swrast/s_logic.c \
        swrast/s_masking.c \
@@ -124,7 +124,6 @@ SWRAST_SOURCES = \
        swrast/s_stencil.c \
        swrast/s_texcombine.c \
        swrast/s_texfilter.c \
-       swrast/s_texstore.c \
        swrast/s_triangle.c \
        swrast/s_zoom.c
 
@@ -218,21 +217,27 @@ SHADER_SOURCES = \
        shader/arbprogram.c \
        shader/atifragshader.c \
        shader/grammar/grammar_mesa.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/shader_api.c \
+       shader/symbol_table.c \
+       shader/shader_api.c
 
 SLANG_SOURCES =        \
        shader/slang/slang_builtin.c    \
@@ -365,5 +370,4 @@ INCLUDE_DIRS = \
        -I$(TOP)/include \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/gallium/include \
-       -I$(TOP)/src/gallium/drivers \
        -I$(TOP)/src/gallium/auxiliary