Merge branch 'master' of ../mesa into vulkan

1 files changed, 13 insertions, 1 deletions

diff --git a/src/gallium/drivers/svga/Makefile.sources b/src/gallium/drivers/svga/Makefile.sources
index 276e6a8e204..5c022f437ad 100644
--- a/src/gallium/drivers/svga/Makefile.sources
+++ b/src/gallium/drivers/svga/Makefile.sources
@@ -1,6 +1,7 @@
 C_SOURCES := \
 	svga_cmd.c \
 	svga_cmd.h \
+	svga_cmd_vgpu10.c \
 	svga_context.c \
 	svga_context.h \
 	svga_debug.h \
@@ -12,6 +13,8 @@ C_SOURCES := \
 	svga_format.c \
 	svga_format.h \
 	svga_hw_reg.h \
+	svga_link.c \
+	svga_link.h \
 	svga_pipe_blend.c \
 	svga_pipe_blit.c \
 	svga_pipe_clear.c \
@@ -20,10 +23,12 @@ C_SOURCES := \
 	svga_pipe_draw.c \
 	svga_pipe_flush.c \
 	svga_pipe_fs.c \
+	svga_pipe_gs.c \
 	svga_pipe_misc.c \
 	svga_pipe_query.c \
 	svga_pipe_rasterizer.c \
 	svga_pipe_sampler.c \
+	svga_pipe_streamout.c \
 	svga_pipe_vertex.c \
 	svga_pipe_vs.c \
 	svga_public.h \
@@ -44,15 +49,19 @@ C_SOURCES := \
 	svga_shader.c \
 	svga_shader.h \
 	svga_state.c \
+	svga_state.h \
 	svga_state_constants.c \
 	svga_state_framebuffer.c \
 	svga_state_fs.c \
-	svga_state.h \
+	svga_state_gs.c \
 	svga_state_need_swtnl.c \
 	svga_state_rss.c \
+	svga_state_sampler.c \
+	svga_state_tgsi_transform.c \
 	svga_state_tss.c \
 	svga_state_vdecl.c \
 	svga_state_vs.c \
+	svga_streamout.h \
 	svga_surface.c \
 	svga_surface.h \
 	svga_swtnl_backend.c \
@@ -65,6 +74,7 @@ C_SOURCES := \
 	svga_tgsi_emit.h \
 	svga_tgsi.h \
 	svga_tgsi_insn.c \
+	svga_tgsi_vgpu10.c \
 	svga_winsys.h \
 	\
 	svgadump/svga_dump.c \
@@ -80,6 +90,7 @@ SVGA_H_FILES := \
 	include/svga3d_caps.h \
 	include/svga3d_cmd.h \
 	include/svga3d_devcaps.h \
+	include/svga3d_dx.h \
 	include/svga3d_limits.h \
 	include/svga3d_reg.h \
 	include/svga3d_shaderdefs.h \
@@ -89,5 +100,6 @@ SVGA_H_FILES := \
 	include/svga_overlay.h \
 	include/svga_reg.h \
 	include/svga_types.h \
+	include/VGPU10ShaderTokens.h \
 	include/vmware_pack_begin.h \
 	include/vmware_pack_end.h