Merge commit 'origin/master' into gallium-sampler-view

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index d1c109c2c5995bd2ef4476c5aa8a8ac22d04bb38..d59e24de1f2fbe5f806d0e2087fd39068981a322 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -15,6 +15,7 @@ MAIN_SOURCES = \
        main/clear.c \
        main/clip.c \
        main/colortab.c \
+       main/condrender.c \
        main/context.c \
        main/convolve.c \
        main/cpuinfo.c \
@@ -33,6 +34,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 +57,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 \
@@ -76,13 +81,17 @@ MAIN_SOURCES = \
        main/texstate.c \
        main/texstore.c \
        main/varray.c \
+       main/version.c \
        main/viewport.c \
        main/vtxfmt.c
 
 GLAPI_SOURCES = \
-       main/dispatch.c \
        glapi/glapi.c \
+       glapi/glapi_dispatch.c \
+       glapi/glapi_entrypoint.c \
+       glapi/glapi_execmem.c \
        glapi/glapi_getproc.c \
+       glapi/glapi_nop.c \
        glapi/glthread.c
 
 MATH_SOURCES = \
@@ -114,7 +123,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 +132,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
 
@@ -188,8 +195,8 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_blit.c \
        state_tracker/st_cb_bufferobjects.c \
        state_tracker/st_cb_clear.c \
+       state_tracker/st_cb_condrender.c \
        state_tracker/st_cb_flush.c \
-       state_tracker/st_cb_get.c \
        state_tracker/st_cb_drawpixels.c \
        state_tracker/st_cb_fbo.c \
        state_tracker/st_cb_feedback.c \
@@ -199,8 +206,6 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_readpixels.c \
        state_tracker/st_cb_strings.c \
        state_tracker/st_cb_texture.c \
-       state_tracker/st_cb_viewport.c \
-       state_tracker/st_api.c \
        state_tracker/st_context.c \
        state_tracker/st_debug.c \
        state_tracker/st_draw.c \
@@ -217,22 +222,27 @@ SHADER_SOURCES = \
        shader/arbprogparse.c \
        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    \
@@ -248,7 +258,6 @@ SLANG_SOURCES =     \
        shader/slang/slang_link.c       \
        shader/slang/slang_log.c        \
        shader/slang/slang_mem.c        \
-       shader/slang/slang_preprocess.c \
        shader/slang/slang_print.c      \
        shader/slang/slang_simplify.c   \
        shader/slang/slang_storage.c    \
@@ -358,6 +367,12 @@ GLAPI_OBJECTS = \
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
 
+### Other archives/libraries
+
+GLSL_LIBS = \
+       $(TOP)/src/glsl/pp/libglslpp.a \
+       $(TOP)/src/glsl/cl/libglslcl.a
+
 
 ### Include directories
 
@@ -365,5 +380,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