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 4e3e44f15a3c64f838150b65ea4aa41116d2c373..2db1843239c6138a0691253594030f2603ea14c5 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -149,56 +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
-
-
-DRAW_SOURCES = \
-       pipe/draw/draw_clip.c \
-       pipe/draw/draw_context.c\
-       pipe/draw/draw_cull.c \
-       pipe/draw/draw_flatshade.c \
-       pipe/draw/draw_offset.c \
-       pipe/draw/draw_twoside.c \
-       pipe/draw/draw_unfilled.c \
-       pipe/draw/draw_vb.c
-
-TGSICORE_SOURCES = \
-       pipe/tgsi/core/tgsi_build.c \
-       pipe/tgsi/core/tgsi_dump.c \
-       pipe/tgsi/core/tgsi_exec.c \
-       pipe/tgsi/core/tgsi_parse.c \
-       pipe/tgsi/core/tgsi_util.c
-
-TGSIMESA_SOURCES = \
-       pipe/tgsi/mesa/mesa_to_tgsi.c
-
-STATETRACKER_SOURCES = \
-       state_tracker/st_atom.c \
-       state_tracker/st_atom_alphatest.c \
-       state_tracker/st_atom_blend.c \
-       state_tracker/st_atom_clear_color.c \
-       state_tracker/st_atom_clip.c \
-       state_tracker/st_atom_depth.c \
-       state_tracker/st_atom_fs.c \
-       state_tracker/st_atom_vs.c \
-       state_tracker/st_atom_framebuffer.c \
-       state_tracker/st_atom_sampler.c \
-       state_tracker/st_atom_scissor.c \
-       state_tracker/st_atom_setup.c \
-       state_tracker/st_atom_stencil.c \
-       state_tracker/st_atom_stipple.c \
-       state_tracker/st_atom_viewport.c \
-       state_tracker/st_cb_clear.c \
-       state_tracker/st_cb_drawpixels.c \
-       state_tracker/st_cb_fbo.c \
-       state_tracker/st_cb_program.c \
-       state_tracker/st_cb_teximage.c \
-       state_tracker/st_draw.c \
-       state_tracker/st_context.c \
-       state_tracker/st_texobj.c
 
 SHADER_SOURCES = \
        shader/arbprogparse.c \
@@ -215,6 +165,7 @@ SHADER_SOURCES = \
        shader/prog_parameter.c \
        shader/prog_print.c \
        shader/prog_statevars.c \
+       shader/prog_uniform.c \
        shader/programopt.c \
        shader/shader_api.c \
 
@@ -290,96 +241,43 @@ SPARC_API =                       \
 COMMON_DRIVER_SOURCES =                        \
        drivers/common/driverfuncs.c
 
-X11_DRIVER_SOURCES =           \
-       drivers/x11/glxapi.c    \
-       drivers/x11/fakeglx.c   \
-       drivers/x11/xfonts.c    \
-       drivers/x11/xm_api.c    \
-       drivers/x11/xm_buffer.c \
-       drivers/x11/xm_dd.c     \
-       drivers/x11/xm_glide.c  \
-       drivers/x11/xm_line.c   \
-       drivers/x11/xm_span.c   \
-       drivers/x11/xm_surface.c        \
-       drivers/x11/xm_tri.c
-
-OSMESA_DRIVER_SOURCES = \
-       drivers/osmesa/osmesa.c
-
-GLIDE_DRIVER_SOURCES =                 \
-       drivers/glide/fxapi.c           \
-       drivers/glide/fxdd.c            \
-       drivers/glide/fxddspan.c        \
-       drivers/glide/fxddtex.c         \
-       drivers/glide/fxsetup.c         \
-       drivers/glide/fxtexman.c        \
-       drivers/glide/fxtris.c          \
-       drivers/glide/fxvb.c            \
-       drivers/glide/fxglidew.c        \
-       drivers/glide/fxg.c
-
-SVGA_DRIVER_SOURCES =                  \
-       drivers/svga/svgamesa.c         \
-       drivers/svga/svgamesa8.c        \
-       drivers/svga/svgamesa15.c       \
-       drivers/svga/svgamesa16.c       \
-       drivers/svga/svgamesa24.c       \
-       drivers/svga/svgamesa32.c
-
-FBDEV_DRIVER_SOURCES =                 \
-       drivers/fbdev/glfbdev.c
 
 
 ### All the core C sources
 
-ALL_SOURCES = \
-       $(GLAPI_SOURCES)        \
-       $(SOLO_SOURCES)         \
-       $(ASM_SOURCES)          \
-       $(COMMON_DRIVER_SOURCES)\
-       $(X11_DRIVER_SOURCES)   \
-       $(FBDEV_DRIVER_SOURCES) \
-       $(OSMESA_DRIVER_SOURCES)
-
-SOLO_SOURCES = \
+MESA_SOURCES = \
        $(MAIN_SOURCES)         \
        $(MATH_SOURCES)         \
        $(VBO_SOURCES)          \
-       $(VF_SOURCES)           \
-       $(DRAW_SOURCES)         \
-       $(TGSICORE_SOURCES)     \
-       $(TGSIMESA_SOURCES)     \
-       $(STATETRACKER_SOURCES) \
        $(TNL_SOURCES)          \
        $(SHADER_SOURCES)       \
        $(SWRAST_SOURCES)       \
        $(SWRAST_SETUP_SOURCES) \
+       $(COMMON_DRIVER_SOURCES) \
        $(ASM_C_SOURCES)        \
        $(SLANG_SOURCES)
 
-CORE_SOURCES = \
+ALL_SOURCES = \
+       $(MESA_SOURCES)         \
        $(GLAPI_SOURCES)        \
-       $(SOLO_SOURCES)
+       $(ASM_SOURCES)          \
+       $(COMMON_DRIVER_SOURCES)
+
 
 
 ### Object files
 
-SOLO_OBJECTS = \
-       $(SOLO_SOURCES:.c=.o) \
+MESA_OBJECTS = \
+       $(MESA_SOURCES:.c=.o) \
        $(ASM_SOURCES:.S=.o)
 
 GLAPI_OBJECTS = \
        $(GLAPI_SOURCES:.c=.o) \
        $(ASM_API:.S=.o)
 
-CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
-
-OSMESA_DRIVER_OBJECTS = $(OSMESA_DRIVER_SOURCES:.c=.o)
 
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
-FBDEV_DRIVER_OBJECTS = $(FBDEV_DRIVER_SOURCES:.c=.o)
-
 
 
 ### Include directories
@@ -395,5 +293,4 @@ INCLUDE_DIRS = \
        -I$(TOP)/src/mesa/shader/grammar \
        -I$(TOP)/src/mesa/shader/slang \
        -I$(TOP)/src/mesa/swrast \
-       -I$(TOP)/src/mesa/swrast_setup \
-       -I$(TOP)/src/mesa/pipe/tgsi
+       -I$(TOP)/src/mesa/swrast_setup