X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesa%2Fsources.mak;h=a0d7dbbace9eb7bd98471952b3c9f28e666f87fb;hb=6b8315494ac84e6b59ae9113653224ed0a546014;hp=b4b36368cfb4bdb3e1687eff2757e71cf6af903c;hpb=cf721c8137a0335016d0ec36449819ba80578b7d;p=mesa.git

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index b4b36368cfb..a0d7dbbace9 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -33,6 +33,7 @@ MAIN_SOURCES = \
 	main/feedback.c \
 	main/ffvertex_prog.c \
 	main/fog.c \
+	main/formats.c \
 	main/framebuffer.c \
 	main/get.c \
 	main/getstring.c \
@@ -55,17 +56,20 @@ MAIN_SOURCES = \
 	main/rastpos.c \
 	main/rbadaptors.c \
 	main/readpix.c \
+	main/remap.c \
 	main/renderbuffer.c \
 	main/scissor.c \
 	main/shaders.c \
 	main/shared.c \
 	main/state.c \
 	main/stencil.c \
+	main/syncobj.c \
 	main/texcompress.c \
 	main/texcompress_s3tc.c \
 	main/texcompress_fxt1.c \
 	main/texenv.c \
 	main/texenvprogram.c \
+	main/texfetch.c \
 	main/texformat.c \
 	main/texgen.c \
 	main/texgetimage.c \
@@ -114,7 +118,6 @@ SWRAST_SOURCES = \
 	swrast/s_feedback.c \
 	swrast/s_fog.c \
 	swrast/s_fragprog.c \
-	swrast/s_imaging.c \
 	swrast/s_lines.c \
 	swrast/s_logic.c \
 	swrast/s_masking.c \
@@ -124,7 +127,6 @@ SWRAST_SOURCES = \
 	swrast/s_stencil.c \
 	swrast/s_texcombine.c \
 	swrast/s_texfilter.c \
-	swrast/s_texstore.c \
 	swrast/s_triangle.c \
 	swrast/s_zoom.c
 
@@ -189,7 +191,6 @@ STATETRACKER_SOURCES = \
 	state_tracker/st_cb_bufferobjects.c \
 	state_tracker/st_cb_clear.c \
 	state_tracker/st_cb_flush.c \
-	state_tracker/st_cb_get.c \
 	state_tracker/st_cb_drawpixels.c \
 	state_tracker/st_cb_fbo.c \
 	state_tracker/st_cb_feedback.c \
@@ -218,21 +219,27 @@ SHADER_SOURCES = \
 	shader/arbprogram.c \
 	shader/atifragshader.c \
 	shader/grammar/grammar_mesa.c \
+	shader/hash_table.c \
+	shader/lex.yy.c \
 	shader/nvfragparse.c \
 	shader/nvprogram.c \
 	shader/nvvertparse.c \
 	shader/program.c \
+	shader/program_parse.tab.c \
+	shader/program_parse_extra.c \
 	shader/prog_cache.c \
 	shader/prog_execute.c \
 	shader/prog_instruction.c \
 	shader/prog_noise.c \
 	shader/prog_optimize.c \
 	shader/prog_parameter.c \
+	shader/prog_parameter_layout.c \
 	shader/prog_print.c \
 	shader/prog_statevars.c \
 	shader/prog_uniform.c \
 	shader/programopt.c \
-	shader/shader_api.c \
+	shader/symbol_table.c \
+	shader/shader_api.c
 
 SLANG_SOURCES =	\
 	shader/slang/slang_builtin.c	\
@@ -303,7 +310,8 @@ SPARC_API =			\
 	sparc/glapi_sparc.S
 
 COMMON_DRIVER_SOURCES =			\
-	drivers/common/driverfuncs.c
+	drivers/common/driverfuncs.c	\
+	drivers/common/meta.c
 
 
 # Sources for building non-Gallium drivers
@@ -364,5 +372,4 @@ INCLUDE_DIRS = \
 	-I$(TOP)/include \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/drivers \
 	-I$(TOP)/src/gallium/auxiliary