X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fsources;h=09692c6f1556bc0f3c845feb55effcb440419405;hb=aacea5218199b6fb614c75d4f6ee14dd27af70b3;hp=deb23f4bf2d9b94b9cebf5b0b21cf99eee957363;hpb=8e5612278261284d4be1e2befdcb2b3426365326;p=mesa.git

diff --git a/src/mesa/sources b/src/mesa/sources
index deb23f4bf2d..09692c6f155 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -7,6 +7,7 @@ MAIN_SOURCES = \
 	main/api_validate.c \
 	main/accum.c \
 	main/attrib.c \
+	main/arrayobj.c \
 	main/blend.c \
 	main/bufferobj.c \
 	main/buffers.c \
@@ -16,12 +17,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,11 +39,14 @@ MAIN_SOURCES = \
 	main/light.c \
 	main/lines.c \
 	main/matrix.c \
+	main/mipmap.c \
+	main/mm.c \
 	main/occlude.c \
 	main/pixel.c \
 	main/points.c \
 	main/polygon.c \
 	main/rastpos.c \
+	main/rbadaptors.c \
 	main/renderbuffer.c \
 	main/state.c \
 	main/stencil.c \
@@ -51,14 +56,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,14 +83,15 @@ 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 \
+	swrast/s_blit.c \
 	swrast/s_buffers.c \
 	swrast/s_copypix.c \
 	swrast/s_context.c \
@@ -97,13 +104,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 +128,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 +152,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 \
@@ -156,6 +161,7 @@ SHADER_SOURCES = \
 	shader/nvvertexec.c \
 	shader/nvvertparse.c \
 	shader/program.c \
+	shader/programopt.c \
 	shader/shaderobjects.c \
 	shader/shaderobjects_3dlabs.c
 
@@ -186,15 +192,24 @@ SLANG_CPP_SOURCES = \
 	shader/slang/MachineIndependent/SymbolTable.cpp	\
 	shader/slang/OGLCompilersDLL/Initialisation.cpp	\
 	shader/slang/OSDependent/Linux/ossource.cpp
-	
+
 SLANG_SOURCES =	\
+	shader/slang/slang_analyse.c	\
 	shader/slang/slang_assemble.c	\
 	shader/slang/slang_assemble_assignment.c	\
 	shader/slang/slang_assemble_conditional.c	\
 	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_library_texsample.c	\
+	shader/slang/slang_link.c	\
 	shader/slang/slang_preprocess.c	\
 	shader/slang/slang_storage.c	\
 	shader/slang/slang_utility.c
@@ -207,7 +222,8 @@ ASM_C_SOURCES =	\
 	x86/rtasm/x86sse.c \
 	sparc/sparc.c \
 	ppc/common_ppc.c \
-	x86-64/x86-64.c
+	x86-64/x86-64.c \
+	shader/slang/slang_execute_x86.c
 
 X86_SOURCES =			\
 	x86/common_x86_asm.S	\
@@ -235,6 +251,9 @@ X86_API =			\
 X86-64_SOURCES =		\
 	x86-64/xform4.S
 
+X86-64_API =			\
+	x86-64/glapi_x86-64.S
+
 SPARC_SOURCES =			\
 	sparc/clip.S		\
 	sparc/norm.S		\
@@ -286,9 +305,17 @@ FBDEV_DRIVER_SOURCES =			\
 
 ### All the core C sources
 
-CORE_SOURCES = \
-	$(MAIN_SOURCES)		\
+ALL_SOURCES = \
 	$(GLAPI_SOURCES)	\
+	$(SOLO_SOURCES)		\
+	$(ASM_SOURCES)		\
+	$(COMMON_DRIVER_SOURCES)\
+	$(X11_DRIVER_SOURCES)	\
+	$(FBDEV_DRIVER_SOURCES) \
+	$(OSMESA_DRIVER_SOURCES)
+
+SOLO_SOURCES = \
+	$(MAIN_SOURCES)		\
 	$(MATH_SOURCES)		\
 	$(ARRAY_CACHE_SOURCES)	\
 	$(TNL_SOURCES)		\
@@ -297,19 +324,31 @@ CORE_SOURCES = \
 	$(SWRAST_SETUP_SOURCES)	\
 	$(ASM_C_SOURCES)	\
 	$(SLANG_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)
 
 COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
+FBDEV_DRIVER_OBJECTS = $(FBDEV_DRIVER_SOURCES:.c=.o)
+
 
 
 ### Include directories