Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / mesa / sources

diff --git a/src/mesa/sources b/src/mesa/sources
index d225d7d15bd06d14ea4d713275e42942a6ee9954..2db1843239c6138a0691253594030f2603ea14c5 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -2,7 +2,6 @@
 
 MAIN_SOURCES = \
        main/api_arrayelt.c \
-       main/api_exec.c \
        main/api_loopback.c \
        main/api_noop.c \
        main/api_validate.c \
@@ -12,7 +11,6 @@ MAIN_SOURCES = \
        main/blend.c \
        main/bufferobj.c \
        main/buffers.c \
-       main/clear.c \
        main/clip.c \
        main/colortab.c \
        main/context.c \
@@ -29,7 +27,6 @@ MAIN_SOURCES = \
        main/extensions.c \
        main/fbobject.c \
        main/feedback.c \
-       main/ffvertex_prog.c \
        main/fog.c \
        main/framebuffer.c \
        main/get.c \
@@ -44,27 +41,21 @@ MAIN_SOURCES = \
        main/matrix.c \
        main/mipmap.c \
        main/mm.c \
-       main/multisample.c \
        main/pixel.c \
-       main/pixelstore.c \
        main/points.c \
        main/polygon.c \
        main/queryobj.c \
        main/rastpos.c \
        main/rbadaptors.c \
-       main/readpix.c \
        main/renderbuffer.c \
-       main/scissor.c \
        main/shaders.c \
        main/state.c \
        main/stencil.c \
        main/texcompress.c \
        main/texcompress_s3tc.c \
        main/texcompress_fxt1.c \
-       main/texenv.c \
        main/texenvprogram.c \
        main/texformat.c \
-       main/texgen.c \
        main/teximage.c \
        main/texobj.c \
        main/texrender.c \
@@ -88,7 +79,7 @@ MATH_SOURCES = \
        math/m_vector.c \
        math/m_xform.c
 
-__SWRAST_SOURCES = \
+SWRAST_SOURCES = \
        swrast/s_aaline.c \
        swrast/s_aatriangle.c \
        swrast/s_accum.c \
@@ -119,15 +110,14 @@ __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 \
-       tnl/t_rasterpos.c \
        tnl/t_vb_program.c \
        tnl/t_vb_render.c \
        tnl/t_vb_texgen.c \
@@ -159,51 +149,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 \
-       state_tracker/st_atom_clip.c \
-       state_tracker/st_atom_constbuf.c \
-       state_tracker/st_atom_depth.c \
-       state_tracker/st_atom_framebuffer.c \
-       state_tracker/st_atom_pixeltransfer.c \
-       state_tracker/st_atom_sampler.c \
-       state_tracker/st_atom_scissor.c \
-       state_tracker/st_atom_shader.c \
-       state_tracker/st_atom_rasterizer.c \
-       state_tracker/st_atom_stipple.c \
-       state_tracker/st_atom_texture.c \
-       state_tracker/st_atom_viewport.c \
-       state_tracker/st_cb_accum.c \
-       state_tracker/st_cb_bitmap.c \
-       state_tracker/st_cb_blit.c \
-       state_tracker/st_cb_bufferobjects.c \
-       state_tracker/st_cb_clear.c \
-       state_tracker/st_cb_flush.c \
-       state_tracker/st_cb_drawpixels.c \
-       state_tracker/st_cb_fbo.c \
-       state_tracker/st_cb_feedback.c \
-       state_tracker/st_cb_program.c \
-       state_tracker/st_cb_queryobj.c \
-       state_tracker/st_cb_rasterpos.c \
-       state_tracker/st_cb_readpixels.c \
-       state_tracker/st_cb_strings.c \
-       state_tracker/st_cb_texture.c \
-       state_tracker/st_context.c \
-       state_tracker/st_debug.c \
-       state_tracker/st_draw.c \
-       state_tracker/st_extensions.c \
-       state_tracker/st_format.c \
-       state_tracker/st_framebuffer.c \
-       state_tracker/st_gen_mipmap.c \
-       state_tracker/st_mesa_to_tgsi.c \
-       state_tracker/st_program.c \
-       state_tracker/st_texture.c
 
 SHADER_SOURCES = \
        shader/arbprogparse.c \
@@ -214,7 +159,6 @@ SHADER_SOURCES = \
        shader/nvprogram.c \
        shader/nvvertparse.c \
        shader/program.c \
-       shader/prog_cache.c \
        shader/prog_debug.c \
        shader/prog_execute.c \
        shader/prog_instruction.c \
@@ -253,6 +197,7 @@ ASM_C_SOURCES =     \
        x86/x86.c \
        x86/3dnow.c \
        x86/sse.c \
+       x86/rtasm/x86sse.c \
        sparc/sparc.c \
        ppc/common_ppc.c \
        x86-64/x86-64.c
@@ -293,7 +238,7 @@ SPARC_SOURCES =                     \
 SPARC_API =                    \
        sparc/glapi_sparc.S
 
-__COMMON_DRIVER_SOURCES =                      \
+COMMON_DRIVER_SOURCES =                        \
        drivers/common/driverfuncs.c
 
 
@@ -304,30 +249,31 @@ MESA_SOURCES = \
        $(MAIN_SOURCES)         \
        $(MATH_SOURCES)         \
        $(VBO_SOURCES)          \
-       $(STATETRACKER_SOURCES) \
        $(TNL_SOURCES)          \
        $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
+       $(COMMON_DRIVER_SOURCES) \
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)
 
 ALL_SOURCES = \
        $(MESA_SOURCES)         \
        $(GLAPI_SOURCES)        \
-       $(MESA_ASM_SOURCES)     \
+       $(ASM_SOURCES)          \
        $(COMMON_DRIVER_SOURCES)
 
 
+
 ### Object files
 
 MESA_OBJECTS = \
        $(MESA_SOURCES:.c=.o) \
-       $(MESA_ASM_SOURCES:.S=.o)
+       $(ASM_SOURCES:.S=.o)
 
 GLAPI_OBJECTS = \
        $(GLAPI_SOURCES:.c=.o) \
-       $(GLAPI_ASM_SOURCES:.S=.o)
+       $(ASM_API:.S=.o)
 
 
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
@@ -340,6 +286,11 @@ INCLUDE_DIRS = \
        -I$(TOP)/include \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/main \
-       -I$(TOP)/src/gallium/include \
-       -I$(TOP)/src/gallium/drivers \
-       -I$(TOP)/src/gallium/auxiliary
+       -I$(TOP)/src/mesa/glapi \
+       -I$(TOP)/src/mesa/math \
+       -I$(TOP)/src/mesa/tnl \
+       -I$(TOP)/src/mesa/shader \
+       -I$(TOP)/src/mesa/shader/grammar \
+       -I$(TOP)/src/mesa/shader/slang \
+       -I$(TOP)/src/mesa/swrast \
+       -I$(TOP)/src/mesa/swrast_setup