Merge branch 'mesa_7_6_branch'

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index b4b36368cfb4bdb3e1687eff2757e71cf6af903c..615a5588eae38f3f7933e7a1130fbd4b6b513dfd 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -33,6 +33,7 @@ MAIN_SOURCES = \
        main/feedback.c \
        main/ffvertex_prog.c \
        main/fog.c \
+       main/formats.c \
        main/framebuffer.c \
        main/get.c \
        main/getstring.c \
@@ -55,17 +56,20 @@ MAIN_SOURCES = \
        main/rastpos.c \
        main/rbadaptors.c \
        main/readpix.c \
+       main/remap.c \
        main/renderbuffer.c \
        main/scissor.c \
        main/shaders.c \
        main/shared.c \
        main/state.c \
        main/stencil.c \
+       main/syncobj.c \
        main/texcompress.c \
        main/texcompress_s3tc.c \
        main/texcompress_fxt1.c \
        main/texenv.c \
        main/texenvprogram.c \
+       main/texfetch.c \
        main/texformat.c \
        main/texgen.c \
        main/texgetimage.c \
@@ -114,7 +118,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 +127,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 +220,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    \
@@ -303,7 +311,8 @@ SPARC_API =                 \
        sparc/glapi_sparc.S
 
 COMMON_DRIVER_SOURCES =                        \
-       drivers/common/driverfuncs.c
+       drivers/common/driverfuncs.c    \
+       drivers/common/meta.c
 
 
 # Sources for building non-Gallium drivers
@@ -364,5 +373,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