Mesa (master): pipe-loader: fix driinfo for software and non-radeonsi drivers

[Nicolai Hähnle]

Module: Mesa
Branch: master
Commit: f45efb8129c52f85d8a8858734942136eb59ae7c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f45efb8129c52f85d8a8858734942136eb59ae7c

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Wed Aug  2 11:38:32 2017 +0200

pipe-loader: fix driinfo for software and non-radeonsi drivers

Fixes: 678dadf1237 ("gallium: move driinfo XML to pipe_loader")
Reviewed-by: Thomas Hellström <thellstrom at vmware.com>

---

 src/gallium/auxiliary/pipe-loader/pipe_loader.c | 2 ++
 src/gallium/state_trackers/dri/drisw.c          | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
index 39d33d848a..6d9acebdb6 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
@@ -51,7 +51,9 @@ static int (*backends[])(struct pipe_loader_device **, int) = {
 };
 
 const char gallium_driinfo_xml[] =
+   DRI_CONF_BEGIN
 #include "driinfo_gallium.h"
+   DRI_CONF_END
 ;
 
 int
diff --git a/src/gallium/state_trackers/dri/drisw.c b/src/gallium/state_trackers/dri/drisw.c
index d064bb0d4a..d3d44bf418 100644
--- a/src/gallium/state_trackers/dri/drisw.c
+++ b/src/gallium/state_trackers/dri/drisw.c
@@ -400,12 +400,12 @@ drisw_init_screen(__DRIscreen * sPriv)
    sPriv->driverPrivate = (void *)screen;
    sPriv->extensions = drisw_screen_extensions;
 
-   struct pipe_screen_config config;
+   if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf)) {
+      struct pipe_screen_config config;
+      config.flags = dri_init_options_get_screen_flags(screen);
 
-   config.flags = dri_init_options_get_screen_flags(screen);
-
-   if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf))
       pscreen = pipe_loader_create_screen(screen->dev, &config);
+   }
 
    if (!pscreen)
       goto fail;