mesa: bring sources into line with sources.mak, but omit gallium code

diff --git a/src/mesa/sources b/src/mesa/sources
index 2db1843239c6138a0691253594030f2603ea14c5..d006191f30e9a76656b81638467e53f93f4a3d21 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -2,6 +2,7 @@
 
 MAIN_SOURCES = \
        main/api_arrayelt.c \
+       main/api_exec.c \
        main/api_loopback.c \
        main/api_noop.c \
        main/api_validate.c \
@@ -11,6 +12,7 @@ MAIN_SOURCES = \
        main/blend.c \
        main/bufferobj.c \
        main/buffers.c \
+       main/clear.c \
        main/clip.c \
        main/colortab.c \
        main/context.c \
@@ -27,6 +29,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 \
@@ -41,23 +44,30 @@ 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/texparam.c \
        main/texrender.c \
        main/texstate.c \
        main/texstore.c \
@@ -67,6 +77,7 @@ MAIN_SOURCES = \
 GLAPI_SOURCES = \
        main/dispatch.c \
        glapi/glapi.c \
+       glapi/glapi_getproc.c \
        glapi/glthread.c
 
 MATH_SOURCES = \
@@ -118,6 +129,7 @@ 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,6 +171,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 \
@@ -260,20 +273,19 @@ MESA_SOURCES = \
 ALL_SOURCES = \
        $(MESA_SOURCES)         \
        $(GLAPI_SOURCES)        \
-       $(ASM_SOURCES)          \
+       $(MESA_ASM_SOURCES)             \
        $(COMMON_DRIVER_SOURCES)
 
 
-
 ### Object files
 
 MESA_OBJECTS = \
        $(MESA_SOURCES:.c=.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)
 
 
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
@@ -284,13 +296,4 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
 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/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
+       -I$(TOP)/src/mesa