diff options
| author | Emil Velikov <[email protected]> | 2014-06-17 14:34:52 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-10 01:06:49 +0100 |
| commit | 29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5 (patch) | |
| tree | 1e3c805a280ff354539fd82d33946b2b8cc90bd0 /src/gallium/targets/dri | |
| parent | f6483aa6947437c42928c879dd28d758b7d12901 (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 <[email protected]>
Tested-by: Rob Clark <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri')
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index fd19d65275f..4da3e71d6af 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ - -I$(top_srcdir)/src/gallium/state_trackers/dri/common \ + -I$(top_srcdir)/src/gallium/state_trackers/dri \ $(GALLIUM_TARGET_CFLAGS) AM_CPPFLAGS = \ @@ -33,12 +33,11 @@ gallium_dri_la_LDFLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri/dri.sym endif # HAVE_LD_VERSION_SCRIPT -# XXX: Fold libdridrm/libdrisw as drivers become megadriver (__dri*DriverExtension) aware gallium_dri_la_LIBADD = \ $(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ $(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/state_trackers/dri/libdri.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ $(top_builddir)/src/gallium/drivers/noop/libnoop.la \ diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index 6f012344066..27e2047740e 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -11,7 +11,7 @@ env.Append(CPPPATH = [ '#/src/mapi', '#/src/mesa', '#/src/mesa/drivers/dri/common', - '#/src/gallium/state_trackers/dri/common', + '#/src/gallium/state_trackers/dri', ]) if env['build'] == 'release': |