From 16873a6e62e2dc7de1f247e8cae1b40bd813a117 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 12 Aug 2014 23:18:23 +0100 Subject: st/dri: define GALLIUM_SOFTPIPE when building kms_swrast To avoid unresolved symbols in the DRI modules with earlier commit we wrapped the innards of dri_kms_init_screen() in a DRI_TARGET/GALLIUM_SOFTPIPE ifdef. At the same time we forgot to adds the defines to the st/dri build systems, breaking kms_swrast and gnome-continuous. Drop the DRI_TARGET define, we're already in st/DRI. Reported-by: Jasper St. Pierre Reported-by: Vadim Rutkovsky Signed-off-by: Emil Velikov --- src/gallium/state_trackers/dri/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/gallium/state_trackers/dri/Makefile.am') diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am index bda75c3..aa196eb 100644 --- a/src/gallium/state_trackers/dri/Makefile.am +++ b/src/gallium/state_trackers/dri/Makefile.am @@ -40,6 +40,11 @@ AM_CPPFLAGS = \ if HAVE_GALLIUM_STATIC_TARGETS AM_CPPFLAGS += \ -DGALLIUM_STATIC_TARGETS=1 + +if HAVE_GALLIUM_SOFTPIPE +AM_CPPFLAGS += \ + -DGALLIUM_SOFTPIPE +endif # HAVE_GALLIUM_SOFTPIPE endif # HAVE_GALLIUM_STATIC_TARGETS noinst_LTLIBRARIES = libdri.la -- cgit v1.1