X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesa%2Fsources;h=dfef696d2dd39a488113c201b87128c886c959c3;hb=a764b7eae0e93245b0fb644d32e72226d4cf42f2;hp=937405474dba1cafcb7d3851d407ea312ad56d52;hpb=f0ff50d4edbeab5aa0df349772ed2eda64878282;p=mesa.git

diff --git a/src/mesa/sources b/src/mesa/sources
index 937405474db..dfef696d2dd 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -16,12 +16,13 @@ MAIN_SOURCES = \
 	main/convolve.c \
 	main/debug.c \
 	main/depth.c \
-	main/dispatch.c \
+	main/depthstencil.c \
 	main/dlist.c \
 	main/drawpix.c \
 	main/enable.c \
 	main/enums.c \
 	main/eval.c \
+	main/execmem.c \
 	main/extensions.c \
 	main/fbobject.c \
 	main/feedback.c \
@@ -37,6 +38,7 @@ MAIN_SOURCES = \
 	main/light.c \
 	main/lines.c \
 	main/matrix.c \
+	main/mm.c \
 	main/occlude.c \
 	main/pixel.c \
 	main/points.c \
@@ -51,14 +53,15 @@ MAIN_SOURCES = \
 	main/texenvprogram.c \
 	main/texformat.c \
 	main/teximage.c \
-	main/texrender.c \
 	main/texobj.c \
+	main/texrender.c \
 	main/texstate.c \
 	main/texstore.c \
 	main/varray.c \
 	main/vtxfmt.c
 
 GLAPI_SOURCES = \
+	main/dispatch.c \
 	glapi/glapi.c \
 	glapi/glthread.c
 
@@ -77,11 +80,11 @@ ARRAY_CACHE_SOURCES = \
 	array_cache/ac_import.c
 
 SWRAST_SOURCES = \
-	swrast/s_fragprog_to_c.c \
 	swrast/s_aaline.c \
 	swrast/s_aatriangle.c \
 	swrast/s_accum.c \
 	swrast/s_alpha.c \
+	swrast/s_arbshader.c \
 	swrast/s_atifragshader.c \
 	swrast/s_bitmap.c \
 	swrast/s_blend.c \
@@ -97,13 +100,12 @@ SWRAST_SOURCES = \
 	swrast/s_logic.c \
 	swrast/s_masking.c \
 	swrast/s_nvfragprog.c \
-	swrast/s_pixeltex.c \
 	swrast/s_points.c \
 	swrast/s_readpix.c \
 	swrast/s_span.c \
 	swrast/s_stencil.c \
-	swrast/s_tcc.c \
-	swrast/s_texture.c \
+	swrast/s_texcombine.c \
+	swrast/s_texfilter.c \
 	swrast/s_texstore.c \
 	swrast/s_triangle.c \
 	swrast/s_zoom.c
@@ -122,6 +124,7 @@ TNL_SOURCES = \
 	tnl/t_save_playback.c \
 	tnl/t_vb_arbprogram.c \
 	tnl/t_vb_arbprogram_sse.c \
+	tnl/t_vb_arbshader.c\
 	tnl/t_vb_program.c \
 	tnl/t_vb_render.c \
 	tnl/t_vb_texgen.c \
@@ -145,10 +148,8 @@ TNL_SOURCES = \
 
 
 SHADER_SOURCES = \
-	shader/arbfragparse.c \
 	shader/arbprogparse.c \
 	shader/arbprogram.c \
-	shader/arbvertparse.c \
 	shader/atifragshader.c \
 	shader/grammar/grammar_mesa.c \
 	shader/nvfragparse.c \
@@ -194,7 +195,14 @@ SLANG_SOURCES =	\
 	shader/slang/slang_assemble_constructor.c	\
 	shader/slang/slang_assemble_typeinfo.c	\
 	shader/slang/slang_compile.c	\
+	shader/slang/slang_compile_function.c	\
+	shader/slang/slang_compile_operation.c	\
+	shader/slang/slang_compile_struct.c	\
+	shader/slang/slang_compile_variable.c	\
 	shader/slang/slang_execute.c	\
+	shader/slang/slang_export.c	\
+	shader/slang/slang_library_noise.c	\
+	shader/slang/slang_link.c	\
 	shader/slang/slang_preprocess.c	\
 	shader/slang/slang_storage.c	\
 	shader/slang/slang_utility.c
@@ -289,9 +297,8 @@ FBDEV_DRIVER_SOURCES =			\
 
 ### All the core C sources
 
-CORE_SOURCES = \
+SOLO_SOURCES = \
 	$(MAIN_SOURCES)		\
-	$(GLAPI_SOURCES)	\
 	$(MATH_SOURCES)		\
 	$(ARRAY_CACHE_SOURCES)	\
 	$(TNL_SOURCES)		\
@@ -303,11 +310,22 @@ CORE_SOURCES = \
 
 #	$(SLANG_C_SOURCES)
 
+CORE_SOURCES = \
+	$(GLAPI_SOURCES)	\
+	$(SOLO_SOURCES)
+
 
 ### Object files
 
-#CORE_OBJECTS = $(CORE_SOURCES:.c=.o) $(SLANG_CPP_SOURCES:.cpp=.o)
-CORE_OBJECTS = $(CORE_SOURCES:.c=.o)
+SOLO_OBJECTS = \
+	$(SOLO_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)