X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fsources;h=e31d8cc4667cf2dbe9bc56947d383a4b20804d2d;hb=21461014b2446208fefae0aabe8232c66d5b3057;hp=ea6840f3d95689fb8b7f9c7f39f71c459e6a424d;hpb=1a8daf0627dde44aaa7c40786782618d4d5a6a36;p=mesa.git

diff --git a/src/mesa/sources b/src/mesa/sources
index ea6840f3d95..e31d8cc4667 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -80,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 \
@@ -111,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 \
@@ -162,10 +162,10 @@ DRAW_SOURCES = \
 	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_stipple.c \
 	pipe/draw/draw_twoside.c \
 	pipe/draw/draw_unfilled.c \
 	pipe/draw/draw_validate.c \
@@ -175,34 +175,32 @@ DRAW_SOURCES = \
 	pipe/draw/draw_vertex_fetch.c \
 	pipe/draw/draw_vertex_shader.c \
 	pipe/draw/draw_vertex_shader_llvm.c \
+	pipe/draw/draw_vf.c \
+	pipe/draw/draw_vf_generic.c \
+	pipe/draw/draw_vf_sse.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
+	pipe/tgsi/exec/tgsi_sse2.c
 
-TGSIDECO_SOURCES = \
-	pipe/tgsi/deco/deco_caps.c
-
-
-LLVMTGSI_SOURCES = \
-	pipe/llvm/gallivm.cpp \
-	pipe/llvm/storage.cpp \
-	pipe/llvm/instructions.cpp
+TGSIUTIL_SOURCES = \
+	pipe/tgsi/util/tgsi_build.c \
+	pipe/tgsi/util/tgsi_dump.c \
+	pipe/tgsi/util/tgsi_parse.c \
+	pipe/tgsi/util/tgsi_util.c
 
 STATECACHE_SOURCES = \
 	pipe/cso_cache/cso_hash.c \
 	pipe/cso_cache/cso_cache.c
 
+PIPEUTIL_SOURCES = \
+	pipe/util/p_tile.c \
+	pipe/util/p_util.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 \
@@ -237,7 +235,7 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_framebuffer.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 \
@@ -327,7 +325,7 @@ SPARC_SOURCES =			\
 SPARC_API =			\
 	sparc/glapi_sparc.S
 
-COMMON_DRIVER_SOURCES =			\
+__COMMON_DRIVER_SOURCES =			\
 	drivers/common/driverfuncs.c
 
 X11_DRIVER_SOURCES =		\
@@ -335,9 +333,9 @@ X11_DRIVER_SOURCES =		\
 	pipe/xlib/fakeglx.c	\
 	pipe/xlib/xfonts.c	\
 	pipe/xlib/xm_api.c	\
-	pipe/xlib/xm_buffer.c	\
 	pipe/xlib/xm_winsys.c	\
-	pipe/xlib/xm_surface.c
+	pipe/xlib/xm_winsys_aub.c	\
+	pipe/xlib/brw_aub.c
 
 OSMESA_DRIVER_SOURCES = \
 	drivers/osmesa/osmesa.c
@@ -371,7 +369,6 @@ FBDEV_DRIVER_SOURCES =			\
 ALL_SOURCES = \
 	$(GLAPI_SOURCES)	\
 	$(SOLO_SOURCES)		\
-        $(LLVMTGSI_SOURCES)     \
 	$(ASM_SOURCES)		\
 	$(COMMON_DRIVER_SOURCES)\
 	$(X11_DRIVER_SOURCES)	\
@@ -385,7 +382,8 @@ SOLO_SOURCES = \
 	$(VF_SOURCES)		\
 	$(DRAW_SOURCES)		\
 	$(TGSIEXEC_SOURCES)	\
-	$(TGSIDECO_SOURCES)	\
+	$(TGSIUTIL_SOURCES)	\
+	$(PIPEUTIL_SOURCES)	\
 	$(STATECACHE_SOURCES)   \
 	$(STATETRACKER_SOURCES)	\
 	$(TNL_SOURCES)		\
@@ -397,15 +395,13 @@ 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)
 
 GLAPI_OBJECTS = \
@@ -427,13 +423,14 @@ FBDEV_DRIVER_OBJECTS = $(FBDEV_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/main
+
+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