X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fsources;h=dbfc01d0edfb2270ee27b4e930a2ad2d2b4ef90c;hb=476248befe2bd04558ce53e937230c1a400a51b6;hp=eed6fb0a0e66c3092412164bfdee8e89cfa1525a;hpb=39adc3025071927b6fd4ec1b9dbe9c03b20c82de;p=mesa.git

diff --git a/src/mesa/sources b/src/mesa/sources
index eed6fb0a0e6..dbfc01d0edf 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -41,13 +41,14 @@ MAIN_SOURCES = \
 	main/matrix.c \
 	main/mipmap.c \
 	main/mm.c \
-	main/occlude.c \
 	main/pixel.c \
 	main/points.c \
 	main/polygon.c \
+	main/queryobj.c \
 	main/rastpos.c \
 	main/rbadaptors.c \
 	main/renderbuffer.c \
+	main/shaders.c \
 	main/state.c \
 	main/stencil.c \
 	main/texcompress.c \
@@ -78,10 +79,6 @@ MATH_SOURCES = \
 	math/m_vector.c \
 	math/m_xform.c
 
-ARRAY_CACHE_SOURCES = \
-	array_cache/ac_context.c \
-	array_cache/ac_import.c
-
 SWRAST_SOURCES = \
 	swrast/s_aaline.c \
 	swrast/s_aatriangle.c \
@@ -118,15 +115,9 @@ SWRAST_SETUP_SOURCES = \
 	swrast_setup/ss_triangle.c 
 
 TNL_SOURCES = \
-	tnl/t_array_api.c \
-	tnl/t_array_import.c \
 	tnl/t_context.c \
 	tnl/t_pipeline.c \
-	tnl/t_save_api.c \
-	tnl/t_save_loopback.c \
-	tnl/t_save_playback.c \
-	tnl/t_vb_arbprogram.c \
-	tnl/t_vb_arbprogram_sse.c \
+	tnl/t_draw.c \
 	tnl/t_vb_program.c \
 	tnl/t_vb_render.c \
 	tnl/t_vb_texgen.c \
@@ -140,12 +131,24 @@ TNL_SOURCES = \
 	tnl/t_vp_build.c \
 	tnl/t_vertex.c \
 	tnl/t_vertex_sse.c \
-	tnl/t_vertex_generic.c \
-	tnl/t_vtx_api.c \
-	tnl/t_vtx_generic.c \
-	tnl/t_vtx_x86.c \
-	tnl/t_vtx_eval.c \
-	tnl/t_vtx_exec.c 
+	tnl/t_vertex_generic.c 
+
+VBO_SOURCES = \
+	vbo/vbo_context.c \
+	vbo/vbo_exec.c \
+	vbo/vbo_exec_api.c \
+	vbo/vbo_exec_array.c \
+	vbo/vbo_exec_draw.c \
+	vbo/vbo_exec_eval.c \
+	vbo/vbo_rebase.c \
+	vbo/vbo_split.c \
+	vbo/vbo_split_copy.c \
+	vbo/vbo_split_inplace.c \
+	vbo/vbo_save.c \
+	vbo/vbo_save_api.c \
+	vbo/vbo_save_draw.c \
+	vbo/vbo_save_loopback.c 
+
 
 SHADER_SOURCES = \
 	shader/arbprogparse.c \
@@ -154,9 +157,10 @@ SHADER_SOURCES = \
 	shader/grammar/grammar_mesa.c \
 	shader/nvfragparse.c \
 	shader/nvprogram.c \
-	shader/nvvertexec.c \
 	shader/nvvertparse.c \
 	shader/program.c \
+	shader/prog_debug.c \
+	shader/prog_execute.c \
 	shader/prog_instruction.c \
 	shader/prog_parameter.c \
 	shader/prog_print.c \
@@ -164,17 +168,8 @@ SHADER_SOURCES = \
 	shader/programopt.c \
 	shader/shader_api.c \
 
-
-##	shader/shaderobjects.c \
-##	shader/shaderobjects_3dlabs.c
-
 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_builtin.c	\
 	shader/slang/slang_codegen.c	\
 	shader/slang/slang_compile.c	\
 	shader/slang/slang_compile_function.c	\
@@ -182,17 +177,18 @@ SLANG_SOURCES =	\
 	shader/slang/slang_compile_struct.c	\
 	shader/slang/slang_compile_variable.c	\
 	shader/slang/slang_emit.c	\
-	shader/slang/slang_error.c	\
-	shader/slang/slang_execute.c	\
-	shader/slang/slang_export.c	\
+	shader/slang/slang_ir.c	\
+	shader/slang/slang_label.c	\
 	shader/slang/slang_library_noise.c	\
-	shader/slang/slang_library_texsample.c	\
 	shader/slang/slang_link.c	\
-	shader/slang/slang_link2.c	\
+	shader/slang/slang_log.c	\
+	shader/slang/slang_mem.c	\
 	shader/slang/slang_preprocess.c	\
+	shader/slang/slang_print.c	\
 	shader/slang/slang_simplify.c	\
 	shader/slang/slang_storage.c	\
-	shader/slang/slang_print.c	\
+	shader/slang/slang_typeinfo.c	\
+	shader/slang/slang_vartable.c	\
 	shader/slang/slang_utility.c
 
 ASM_C_SOURCES =	\
@@ -203,8 +199,7 @@ ASM_C_SOURCES =	\
 	x86/rtasm/x86sse.c \
 	sparc/sparc.c \
 	ppc/common_ppc.c \
-	x86-64/x86-64.c \
-	shader/slang/slang_execute_x86.c
+	x86-64/x86-64.c
 
 X86_SOURCES =			\
 	x86/common_x86_asm.S	\
@@ -223,8 +218,7 @@ X86_SOURCES =			\
 	x86/sse_xform3.S	\
 	x86/sse_xform4.S	\
 	x86/sse_normal.S	\
-	x86/read_rgba_span_x86.S \
-	tnl/t_vtx_x86_gcc.S
+	x86/read_rgba_span_x86.S
 
 X86_API =			\
 	x86/glapi_x86.S
@@ -253,6 +247,7 @@ X11_DRIVER_SOURCES =		\
 	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_tri.c
@@ -298,7 +293,7 @@ ALL_SOURCES = \
 SOLO_SOURCES = \
 	$(MAIN_SOURCES)		\
 	$(MATH_SOURCES)		\
-	$(ARRAY_CACHE_SOURCES)	\
+	$(VBO_SOURCES)		\
 	$(TNL_SOURCES)		\
 	$(SHADER_SOURCES)	\
 	$(SWRAST_SOURCES)	\