projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added line smooth test
[mesa.git] / src / mesa / sources
diff --git a/src/mesa/sources b/src/mesa/sources
index 30d3c32b8360248f1f6a52daf3cd07ff9c9e65f6..f0bf7b31fbca3fda41c48985132e931fb5dea1ce 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -27,6 +27,7 @@ MAIN_SOURCES = \
        main/extensions.c \
        main/fbobject.c \
        main/feedback.c \
+       main/ffvertex_prog.c \
        main/fog.c \
        main/framebuffer.c \
        main/get.c \
@@ -79,7 +80,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 \
@@ -110,11 +111,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 \
@@ -155,59 +156,14 @@ VF_SOURCES = \
        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_debug.c \
-       pipe/draw/draw_feedback.c \
-       pipe/draw/draw_flatshade.c \
-       pipe/draw/draw_offset.c \
-       pipe/draw/draw_prim.c \
-       pipe/draw/draw_twoside.c \
-       pipe/draw/draw_unfilled.c \
-       pipe/draw/draw_validate.c \
-       pipe/draw/draw_vertex.c \
-       pipe/draw/draw_vertex_cache.c \
-       pipe/draw/draw_vertex_fetch.c \
-       pipe/draw/draw_vertex_shader.c \
-       pipe/draw/draw_vertex_shader_llvm.c \
-       pipe/draw/draw_wide_prims.c
-
-TGSIEXEC_SOURCES = \
-       pipe/tgsi/exec/tgsi_build.c \
-       pipe/tgsi/exec/tgsi_dump.c \
-       pipe/tgsi/exec/tgsi_exec.c \
-       pipe/tgsi/exec/tgsi_parse.c \
-       pipe/tgsi/exec/tgsi_sse2.c \
-       pipe/tgsi/exec/tgsi_util.c
-
-TGSIDECO_SOURCES = \
-       pipe/tgsi/deco/deco_caps.c
-
-
-ifeq ($(MESA_LLVM),1)
-  LLVMTGSI_SOURCES = \
-       pipe/llvm/llvmtgsi.cpp \
-       pipe/llvm/storage.cpp \
-       pipe/llvm/instructions.cpp
-endif
-
-STATECACHE_SOURCES = \
-       pipe/cso_cache/cso_hash.c \
-       pipe/cso_cache/cso_cache.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_constbuf.c \
        state_tracker/st_atom_depth.c \
-       state_tracker/st_atom_fixedfunction.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 \
@@ -228,14 +184,17 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_readpixels.c \
        state_tracker/st_cb_strings.c \
        state_tracker/st_cb_texture.c \
-        state_tracker/st_cache.c \
+       state_tracker/st_cache.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_mipmap_tree.c
+       state_tracker/st_texture.c
 
 SHADER_SOURCES = \
        shader/arbprogparse.c \
@@ -246,6 +205,7 @@ 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 \
@@ -324,23 +284,9 @@ SPARC_SOURCES =                    \
 SPARC_API =                    \
        sparc/glapi_sparc.S
 
-COMMON_DRIVER_SOURCES =                        \
+__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_winsys.c \
-       drivers/x11/xm_span.c   \
-       drivers/x11/xm_surface.c        \
-       drivers/x11/xm_tri.c
-
 OSMESA_DRIVER_SOURCES = \
        drivers/osmesa/osmesa.c
 
@@ -373,8 +319,7 @@ FBDEV_DRIVER_SOURCES =                      \
 ALL_SOURCES = \
        $(GLAPI_SOURCES)        \
        $(SOLO_SOURCES)         \
-        $(LLVMTGSI_SOURCES)     \
-       $(ASM_SOURCES)          \
+       $(MESA_ASM_SOURCES)             \
        $(COMMON_DRIVER_SOURCES)\
        $(X11_DRIVER_SOURCES)   \
        $(FBDEV_DRIVER_SOURCES) \
@@ -387,7 +332,8 @@ SOLO_SOURCES = \
        $(VF_SOURCES)           \
        $(DRAW_SOURCES)         \
        $(TGSIEXEC_SOURCES)     \
-       $(TGSIDECO_SOURCES)     \
+       $(TGSIUTIL_SOURCES)     \
+       $(PIPEUTIL_SOURCES)     \
        $(STATECACHE_SOURCES)   \
        $(STATETRACKER_SOURCES) \
        $(TNL_SOURCES)          \
@@ -399,20 +345,18 @@ SOLO_SOURCES = \
 
 CORE_SOURCES = \
        $(GLAPI_SOURCES)        \
-       $(SOLO_SOURCES)         \
-       $(LLVMTGSI_SOURCES)
+       $(SOLO_SOURCES)
 
 
 ### Object files
 
 SOLO_OBJECTS = \
        $(SOLO_SOURCES:.c=.o) \
-       $(LLVMTGSI_SOURCES:.cpp=.o) \
-       $(ASM_SOURCES:.S=.o)
+       $(MESA_ASM_SOURCES:.S=.o)
 
 GLAPI_OBJECTS = \
        $(GLAPI_SOURCES:.c=.o) \
-       $(ASM_API:.S=.o)
+       $(GLAPI_ASM_SOURCES:.S=.o)
 
 CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
 
@@ -430,12 +374,16 @@ INCLUDE_DIRS = \
        -I$(TOP)/include \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/main \
-       -I$(TOP)/src/mesa/glapi \
-       -I$(TOP)/src/mesa/math \
+       -I$(TOP)/src/gallium/include \
+       -I$(TOP)/src/gallium/drivers \
+       -I$(TOP)/src/gallium/auxiliary
+
+OLD_INCLUDE_DIRS = \
        -I$(TOP)/src/mesa/tnl \
+       -I$(TOP)/src/mesa/math \
+       -I$(TOP)/src/mesa/swrast \
+       -I$(TOP)/src/mesa/swrast_setup \
        -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 \
-       -I$(TOP)/src/mesa/pipe/tgsi
+       -I$(TOP)/s$(TOP)/src/gallium/auxiliary/tgsi