git.libre-soc.org Git - mesa.git/commit

author	Emil Velikov <emil.l.velikov@gmail.com>
	Tue, 17 Jun 2014 13:34:52 +0000 (14:34 +0100)
committer	Emil Velikov <emil.l.velikov@gmail.com>
	Thu, 10 Jul 2014 00:06:49 +0000 (01:06 +0100)
commit	29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5
tree	1e3c805a280ff354539fd82d33946b2b8cc90bd0	tree
parent	f6483aa6947437c42928c879dd28d758b7d12901	commit \| diff

st/dri: merge dri/drm and dri/sw backends

Move the driver_name to dri2/drisw and remove all the SPLIT_TAGETS
mayhem. In the next step we'll unify the dri and dri-swrast targets,
completing the gallium DRI megadriver.

v2: Remove leftover st/dri Makefiles from CONFIG_FILES. Spotted by
Thomas Helland.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>

39 files changed:

configure.ac		diff \| blob \| history
src/gallium/Automake.inc		diff \| blob \| history
src/gallium/state_trackers/dri/Makefile.am		diff \| blob \| history
src/gallium/state_trackers/dri/Makefile.sources	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/SConscript		diff \| blob \| history
src/gallium/state_trackers/dri/common/dri_context.c	[deleted file]	blob \| history
src/gallium/state_trackers/dri/common/dri_context.h	[deleted file]	blob \| history
src/gallium/state_trackers/dri/common/dri_drawable.c	[deleted file]	blob \| history
src/gallium/state_trackers/dri/common/dri_drawable.h	[deleted file]	blob \| history
src/gallium/state_trackers/dri/common/dri_screen.c	[deleted file]	blob \| history
src/gallium/state_trackers/dri/common/dri_screen.h	[deleted file]	blob \| history
src/gallium/state_trackers/dri/dri2.c	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/dri2_buffer.h	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/dri_context.c	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/dri_context.h	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/dri_drawable.c	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/dri_drawable.h	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/dri_screen.c	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/dri_screen.h	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/drisw.c	[new file with mode: 0644]	blob
src/gallium/state_trackers/dri/drm/Makefile.am	[deleted file]	blob \| history
src/gallium/state_trackers/dri/drm/Makefile.sources	[deleted file]	blob \| history
src/gallium/state_trackers/dri/drm/SConscript	[deleted file]	blob \| history
src/gallium/state_trackers/dri/drm/dri2.c	[deleted file]	blob \| history
src/gallium/state_trackers/dri/drm/dri2_buffer.h	[deleted file]	blob \| history
src/gallium/state_trackers/dri/drm/dri_context.c	[deleted symlink]	blob \| history
src/gallium/state_trackers/dri/drm/dri_drawable.c	[deleted symlink]	blob \| history
src/gallium/state_trackers/dri/drm/dri_screen.c	[deleted symlink]	blob \| history
src/gallium/state_trackers/dri/sw/Makefile.am	[deleted file]	blob \| history
src/gallium/state_trackers/dri/sw/Makefile.sources	[deleted file]	blob \| history
src/gallium/state_trackers/dri/sw/SConscript	[deleted file]	blob \| history
src/gallium/state_trackers/dri/sw/dri_context.c	[deleted symlink]	blob \| history
src/gallium/state_trackers/dri/sw/dri_drawable.c	[deleted symlink]	blob \| history
src/gallium/state_trackers/dri/sw/dri_screen.c	[deleted symlink]	blob \| history
src/gallium/state_trackers/dri/sw/drisw.c	[deleted file]	blob \| history
src/gallium/targets/dri-swrast/Makefile.am		diff \| blob \| history
src/gallium/targets/dri-swrast/SConscript		diff \| blob \| history
src/gallium/targets/dri/Makefile.am		diff \| blob \| history
src/gallium/targets/dri/SConscript		diff \| blob \| history

RSS Atom