[Mesa-dev] [PATCH 13/16] st/dri: implement v2 of DRI_ConfigOptions

[Jon Turney]

On 30/06/2017 13:45, Nicolai Hähnle wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
> 
> ---
>   src/gallium/auxiliary/pipe-loader/pipe_loader.c    | 13 ++++++++++++
>   src/gallium/auxiliary/pipe-loader/pipe_loader.h    | 16 +++++++++++++++
>   .../auxiliary/pipe-loader/pipe_loader_drm.c        | 23 ++++++++++++++++++++++
>   src/gallium/state_trackers/dri/dri_screen.c        |  5 +++--
>   4 files changed, 55 insertions(+), 2 deletions(-) 

This change uses pipe_loader_get_driinfo_xml() unconditionally in 
pipe_loader.c, but it's definition in pipe_loader_get_driinfo_xml() is 
only built if HAVE_LIBDRM is defined.

I guess something like the attached is needed?

-------------- next part --------------
From b9286109b7037af043ba5d6ebb37f620f530e578 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney at dronecode.org.uk>
Date: Thu, 17 Aug 2017 22:10:52 +0100
Subject: [PATCH] Fix build when HAVE_LIBDRM isn't defined

make[4]: Entering directory '/wip/mesa/build/src/gallium/targets/dri'
  CXXLD    gallium_dri.la
../../../../src/gallium/auxiliary/pipe-loader/.libs/libpipe_loader_static.a(libpipe_loader_static_la-pipe_loader.o): In function `pipe_loader_get_driinfo_xml':
/mesa/build/src/gallium/auxiliary/pipe-loader/../../../../../src/gallium/auxiliary/pipe-loader/pipe_loader.c:117: undefined reference to `pipe_loader_drm_get_driinfo_xml'

b4ff5e90 uses pipe_loader_get_driinfo_xml() unconditionally in
pipe_loader.c, but it's definition in pipe_loader_get_driinfo_xml() is only
built if HAVE_LIBDRM.

Arrange to always use the default XML if HAVE_LIBDRM isn't defined.

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
---
 src/gallium/auxiliary/pipe-loader/pipe_loader.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
index 926db49fd24..e7cf9f86d99 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
@@ -114,7 +114,11 @@ pipe_loader_load_options(struct pipe_loader_device *dev)
 char *
 pipe_loader_get_driinfo_xml(const char *driver_name)
 {
+#ifdef HAVE_LIBDRM
    char *xml = pipe_loader_drm_get_driinfo_xml(driver_name);
+#else
+   char *xml = NULL;
+#endif
 
    if (!xml)
       xml = strdup(gallium_driinfo_xml);
-- 
2.14.1