X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fsources;h=e3d5f228493e32f88fc1562990f313561e5eb80f;hb=3e625ce18e35b2b0343962f93480abf4bf9b188a;hp=31aeb5b451cc63d738267553cd22e21e2865f9ca;hpb=68caa076a94c28c1c9e62b9831d5f31c1bb008ce;p=mesa.git

diff --git a/src/mesa/sources b/src/mesa/sources
index 31aeb5b451c..e3d5f228493 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -156,49 +156,8 @@ VF_SOURCES = \
 	vf/vf_generic.c \
 	vf/vf_sse.c
 
-
-DRAW_SOURCES = \
-	pipe/draw/draw_clip.c \
-	pipe/draw/draw_context.c\
-	pipe/draw/draw_cull.c \
-	pipe/draw/draw_debug.c \
-	pipe/draw/draw_flatshade.c \
-	pipe/draw/draw_offset.c \
-	pipe/draw/draw_prim.c \
-	pipe/draw/draw_twoside.c \
-	pipe/draw/draw_unfilled.c \
-	pipe/draw/draw_validate.c \
-	pipe/draw/draw_vbuf.c \
-	pipe/draw/draw_vertex.c \
-	pipe/draw/draw_vertex_cache.c \
-	pipe/draw/draw_vertex_fetch.c \
-	pipe/draw/draw_vertex_shader.c \
-	pipe/draw/draw_vertex_shader_llvm.c \
-	pipe/draw/draw_wide_prims.c
-
-TGSIEXEC_SOURCES = \
-	pipe/tgsi/exec/tgsi_exec.c \
-	pipe/tgsi/exec/tgsi_sse2.c
-
-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
-
-
-LLVMTGSI_SOURCES = \
-	pipe/llvm/gallivm.cpp \
-	pipe/llvm/storage.cpp \
-	pipe/llvm/instructions.cpp
-
-STATECACHE_SOURCES = \
-	pipe/cso_cache/cso_hash.c \
-	pipe/cso_cache/cso_cache.c
-
 STATETRACKER_SOURCES = \
 	state_tracker/st_atom.c \
-	state_tracker/st_atom_alphatest.c \
 	state_tracker/st_atom_blend.c \
 	state_tracker/st_atom_clip.c \
 	state_tracker/st_atom_constbuf.c \
@@ -225,13 +184,13 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_readpixels.c \
 	state_tracker/st_cb_strings.c \
 	state_tracker/st_cb_texture.c \
-        state_tracker/st_cache.c \
 	state_tracker/st_context.c \
 	state_tracker/st_debug.c \
 	state_tracker/st_draw.c \
 	state_tracker/st_extensions.c \
 	state_tracker/st_format.c \
 	state_tracker/st_framebuffer.c \
+	state_tracker/st_gen_mipmap.c \
 	state_tracker/st_mesa_to_tgsi.c \
 	state_tracker/st_program.c \
 	state_tracker/st_texture.c
@@ -327,15 +286,6 @@ SPARC_API =			\
 __COMMON_DRIVER_SOURCES =			\
 	drivers/common/driverfuncs.c
 
-X11_DRIVER_SOURCES =		\
-	pipe/xlib/glxapi.c	\
-	pipe/xlib/fakeglx.c	\
-	pipe/xlib/xfonts.c	\
-	pipe/xlib/xm_api.c	\
-	pipe/xlib/xm_winsys.c	\
-	pipe/xlib/xm_winsys_aub.c	\
-	pipe/xlib/brw_aub.c
-
 OSMESA_DRIVER_SOURCES = \
 	drivers/osmesa/osmesa.c
 
@@ -368,8 +318,7 @@ FBDEV_DRIVER_SOURCES =			\
 ALL_SOURCES = \
 	$(GLAPI_SOURCES)	\
 	$(SOLO_SOURCES)		\
-        $(LLVMTGSI_SOURCES)     \
-	$(ASM_SOURCES)		\
+	$(MESA_ASM_SOURCES)		\
 	$(COMMON_DRIVER_SOURCES)\
 	$(X11_DRIVER_SOURCES)	\
 	$(FBDEV_DRIVER_SOURCES) \
@@ -383,6 +332,7 @@ SOLO_SOURCES = \
 	$(DRAW_SOURCES)		\
 	$(TGSIEXEC_SOURCES)	\
 	$(TGSIUTIL_SOURCES)	\
+	$(PIPEUTIL_SOURCES)	\
 	$(STATECACHE_SOURCES)   \
 	$(STATETRACKER_SOURCES)	\
 	$(TNL_SOURCES)		\
@@ -394,20 +344,18 @@ 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)
+	$(MESA_ASM_SOURCES:.S=.o)
 
 GLAPI_OBJECTS = \
 	$(GLAPI_SOURCES:.c=.o) \
-	$(ASM_API:.S=.o)
+	$(GLAPI_ASM_SOURCES:.S=.o)
 
 CORE_OBJECTS = $(SOLO_OBJECTS) $(GLAPI_OBJECTS)
 
@@ -425,14 +373,16 @@ 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/shader \
-	-I$(TOP)/src/mesa/shader/grammar \
-	-I$(TOP)/src/mesa/shader/slang
+	-I$(TOP)/src/gallium/include \
+	-I$(TOP)/src/gallium/drivers \
+	-I$(TOP)/src/gallium/auxiliary
 
 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/pipe/tgsi
+	-I$(TOP)/src/mesa/shader \
+	-I$(TOP)/src/mesa/shader/grammar \
+	-I$(TOP)/src/mesa/shader/slang \
+	-I$(TOP)/s$(TOP)/src/gallium/auxiliary/tgsi