From 16873a6e62e2dc7de1f247e8cae1b40bd813a117 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 12 Aug 2014 23:18:23 +0100 Subject: [PATCH] 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 +++++ src/gallium/state_trackers/dri/SConscript | 5 ++++- src/gallium/state_trackers/dri/dri2.c | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am index bda75c3f9b8..aa196ebbb11 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 diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript index 159ca80328f..9b0dc648c9f 100644 --- a/src/gallium/state_trackers/dri/SConscript +++ b/src/gallium/state_trackers/dri/SConscript @@ -19,7 +19,10 @@ env.Append(CPPPATH = [ xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h ]) -env.Append(CPPDEFINES = [('GALLIUM_STATIC_TARGETS', '1')]) +env.Append(CPPDEFINES = [ + ('GALLIUM_STATIC_TARGETS', '1'), + 'GALLIUM_SOFTPIPE', +]) sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES') diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index c466de78379..4bca2389f2a 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1323,7 +1323,6 @@ dri_kms_init_screen(__DRIscreen * sPriv) { #if GALLIUM_STATIC_TARGETS #if defined(GALLIUM_SOFTPIPE) -#if defined(DRI_TARGET) const __DRIconfig **configs; struct dri_screen *screen; struct pipe_screen *pscreen = NULL; @@ -1354,7 +1353,6 @@ dri_kms_init_screen(__DRIscreen * sPriv) fail: dri_destroy_screen_helper(screen); FREE(screen); -#endif // DRI_TARGET #endif // GALLIUM_SOFTPIPE #endif // GALLIUM_STATIC_TARGETS return NULL; -- 2.30.2