Merge remote branch 'origin/master' into HEAD

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

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 14fd8597a8fc52b1d095932578d556acf506ca50..6913d9f40fd351903a0114504f8339e53b7e1466 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -17,10 +17,12 @@ MAIN_SOURCES = \
        main/colortab.c \
        main/context.c \
        main/convolve.c \
+       main/cpuinfo.c \
        main/debug.c \
        main/depth.c \
        main/depthstencil.c \
        main/dlist.c \
+       main/dlopen.c \
        main/drawpix.c \
        main/enable.c \
        main/enums.c \
@@ -56,6 +58,7 @@ MAIN_SOURCES = \
        main/renderbuffer.c \
        main/scissor.c \
        main/shaders.c \
+       main/shared.c \
        main/state.c \
        main/stencil.c \
        main/texcompress.c \
@@ -72,6 +75,7 @@ MAIN_SOURCES = \
        main/texstate.c \
        main/texstore.c \
        main/varray.c \
+       main/viewport.c \
        main/vtxfmt.c
 
 GLAPI_SOURCES = \
@@ -87,10 +91,12 @@ MATH_SOURCES = \
        math/m_eval.c \
        math/m_matrix.c \
        math/m_translate.c \
-       math/m_vector.c \
+       math/m_vector.c
+
+MATH_XFORM_SOURCES = \
        math/m_xform.c
 
-__SWRAST_SOURCES = \
+SWRAST_SOURCES = \
        swrast/s_aaline.c \
        swrast/s_aatriangle.c \
        swrast/s_accum.c \
@@ -99,7 +105,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 \
@@ -121,11 +127,11 @@ __SWRAST_SOURCES = \
        swrast/s_triangle.c \
        swrast/s_zoom.c
 
-__SWRAST_SETUP_SOURCES = \
+SWRAST_SETUP_SOURCES = \
        swrast_setup/ss_context.c \
        swrast_setup/ss_triangle.c 
 
-__TNL_SOURCES = \
+TNL_SOURCES = \
        tnl/t_context.c \
        tnl/t_pipeline.c \
        tnl/t_draw.c \
@@ -161,11 +167,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 \
@@ -197,10 +198,12 @@ 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 \
+       state_tracker/st_draw_feedback.c \
        state_tracker/st_extensions.c \
        state_tracker/st_format.c \
        state_tracker/st_framebuffer.c \
@@ -219,9 +222,10 @@ SHADER_SOURCES = \
        shader/nvvertparse.c \
        shader/program.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_print.c \
        shader/prog_statevars.c \
@@ -240,7 +244,6 @@ SLANG_SOURCES =     \
        shader/slang/slang_emit.c       \
        shader/slang/slang_ir.c \
        shader/slang/slang_label.c      \
-       shader/slang/slang_library_noise.c      \
        shader/slang/slang_link.c       \
        shader/slang/slang_log.c        \
        shader/slang/slang_mem.c        \
@@ -254,9 +257,10 @@ 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 \
        sparc/sparc.c \
        ppc/common_ppc.c \
        x86-64/x86-64.c
@@ -297,30 +301,40 @@ SPARC_SOURCES =                   \
 SPARC_API =                    \
        sparc/glapi_sparc.S
 
-__COMMON_DRIVER_SOURCES =                      \
+COMMON_DRIVER_SOURCES =                        \
        drivers/common/driverfuncs.c
 
 
-
-### All the core C sources
-
+# Sources for building non-Gallium drivers
 MESA_SOURCES = \
        $(MAIN_SOURCES)         \
        $(MATH_SOURCES)         \
+       $(MATH_XFORM_SOURCES)   \
        $(VBO_SOURCES)          \
-       $(STATETRACKER_SOURCES) \
        $(TNL_SOURCES)          \
        $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
+       $(COMMON_DRIVER_SOURCES)\
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)
 
+# Sources for building Gallium drivers
+MESA_GALLIUM_SOURCES = \
+       $(MAIN_SOURCES)         \
+       $(MATH_SOURCES)         \
+       $(VBO_SOURCES)          \
+       $(STATETRACKER_SOURCES) \
+       $(SHADER_SOURCES)       \
+       x86/common_x86.c        \
+       $(SLANG_SOURCES)
+
+# All the core C sources, for dependency checking
 ALL_SOURCES = \
        $(MESA_SOURCES)         \
        $(GLAPI_SOURCES)        \
        $(MESA_ASM_SOURCES)     \
-       $(COMMON_DRIVER_SOURCES)
+       $(STATETRACKER_SOURCES)
 
 
 ### Object files
@@ -329,6 +343,10 @@ MESA_OBJECTS = \
        $(MESA_SOURCES:.c=.o) \
        $(MESA_ASM_SOURCES:.S=.o)
 
+MESA_GALLIUM_OBJECTS = \
+       $(MESA_GALLIUM_SOURCES:.c=.o) \
+       $(MESA_ASM_SOURCES:.S=.o)
+
 GLAPI_OBJECTS = \
        $(GLAPI_SOURCES:.c=.o) \
        $(GLAPI_ASM_SOURCES:.S=.o)