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 1bd81506e0108349eaaa557cb1999ae38b54b2aa..d59e24de1f2fbe5f806d0e2087fd39068981a322 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -15,8 +15,10 @@ MAIN_SOURCES = \
        main/clear.c \
        main/clip.c \
        main/colortab.c \
+       main/condrender.c \
        main/context.c \
        main/convolve.c \
+       main/cpuinfo.c \
        main/debug.c \
        main/depth.c \
        main/depthstencil.c \
@@ -32,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 \
@@ -54,18 +57,23 @@ 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 \
        main/teximage.c \
        main/texobj.c \
        main/texparam.c \
@@ -73,12 +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 = \
@@ -91,7 +104,6 @@ MATH_SOURCES = \
        math/m_vector.c
 
 MATH_XFORM_SOURCES = \
-       $(MATH_SOURCES) \
        math/m_xform.c
 
 SWRAST_SOURCES = \
@@ -103,7 +115,7 @@ SWRAST_SOURCES = \
        swrast/s_bitmap.c \
        swrast/s_blend.c \
        swrast/s_blit.c \
-       swrast/s_buffers.c \
+       swrast/s_clear.c \
        swrast/s_copypix.c \
        swrast/s_context.c \
        swrast/s_depth.c \
@@ -111,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 \
@@ -121,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
 
@@ -165,11 +175,6 @@ VBO_SOURCES = \
        vbo/vbo_save_draw.c \
        vbo/vbo_save_loopback.c 
 
-VF_SOURCES = \
-       vf/vf.c \
-       vf/vf_generic.c \
-       vf/vf_sse.c
-
 STATETRACKER_SOURCES = \
        state_tracker/st_atom.c \
        state_tracker/st_atom_blend.c \
@@ -190,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 \
@@ -201,7 +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_api.c \
        state_tracker/st_context.c \
        state_tracker/st_debug.c \
        state_tracker/st_draw.c \
@@ -218,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_debug.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    \
@@ -249,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    \
@@ -259,7 +267,7 @@ SLANG_SOURCES =     \
 
 ASM_C_SOURCES =        \
        x86/common_x86.c \
-       x86/x86.c \
+       x86/x86_xform.c \
        x86/3dnow.c \
        x86/sse.c \
        x86/rtasm/x86sse.c \
@@ -304,14 +312,14 @@ SPARC_API =                       \
        sparc/glapi_sparc.S
 
 COMMON_DRIVER_SOURCES =                        \
-       drivers/common/driverfuncs.c
-
+       drivers/common/driverfuncs.c    \
+       drivers/common/meta.c
 
 
-### All the core C sources
-
+# Sources for building non-Gallium drivers
 MESA_SOURCES = \
        $(MAIN_SOURCES)         \
+       $(MATH_SOURCES)         \
        $(MATH_XFORM_SOURCES)   \
        $(VBO_SOURCES)          \
        $(TNL_SOURCES)          \
@@ -322,19 +330,24 @@ MESA_SOURCES = \
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)
 
-ALL_SOURCES = \
-       $(MESA_SOURCES)         \
-       $(GLAPI_SOURCES)        \
-       $(MESA_ASM_SOURCES)
-
+# Sources for building Gallium drivers
 MESA_GALLIUM_SOURCES = \
        $(MAIN_SOURCES)         \
        $(MATH_SOURCES)         \
        $(VBO_SOURCES)          \
        $(STATETRACKER_SOURCES) \
        $(SHADER_SOURCES)       \
+       ppc/common_ppc.c        \
+       x86/common_x86.c        \
        $(SLANG_SOURCES)
 
+# All the core C sources, for dependency checking
+ALL_SOURCES = \
+       $(MESA_SOURCES)         \
+       $(GLAPI_SOURCES)        \
+       $(MESA_ASM_SOURCES)     \
+       $(STATETRACKER_SOURCES)
+
 
 ### Object files
 
@@ -354,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
 
@@ -361,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