util: rename xmlpool.h to driconf.h

[mesa.git] / src / gallium / auxiliary / pipe-loader / pipe_loader.c

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
index f55312f548a597c501a4db3cf6c17484112eadd8..cfe6faddaf1e7110896b9e493281a0114dcc7848 100644 (file)
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
@@ -31,8 +31,11 @@
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/u_dl.h"
+#include "util/u_file.h"
 #include "util/xmlconfig.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
+
+#include <string.h>
 
 #ifdef _MSC_VER
 #include <stdlib.h>
@@ -49,7 +52,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
@@ -82,43 +87,49 @@ pipe_loader_base_release(struct pipe_loader_device **dev)
    *dev = NULL;
 }
 
-const struct drm_conf_ret *
-pipe_loader_configuration(struct pipe_loader_device *dev,
-                          enum drm_conf conf)
-{
-   return dev->ops->configuration(dev, conf);
-}
-
 void
 pipe_loader_load_options(struct pipe_loader_device *dev)
 {
    if (dev->option_info.info)
       return;
 
-   const char *xml_options = gallium_driinfo_xml;
-   const struct drm_conf_ret *xml_options_conf =
-      pipe_loader_configuration(dev, DRM_CONF_XML_OPTIONS);
-
-   if (xml_options_conf)
-      xml_options = xml_options_conf->val.val_pointer;
+   const char *xml_options = dev->ops->get_driconf_xml(dev);
+   if (!xml_options)
+      xml_options = gallium_driinfo_xml;
 
    driParseOptionInfo(&dev->option_info, xml_options);
    driParseConfigFiles(&dev->option_cache, &dev->option_info, 0,
-                       dev->driver_name);
+                       dev->driver_name, NULL, NULL, 0);
+}
+
+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);
+
+   return xml;
 }
 
 struct pipe_screen *
-pipe_loader_create_screen(struct pipe_loader_device *dev,
-                          struct pipe_screen_config *config)
+pipe_loader_create_screen(struct pipe_loader_device *dev)
 {
+   struct pipe_screen_config config;
+
    pipe_loader_load_options(dev);
-   config->options = &dev->option_cache;
+   config.options = &dev->option_cache;
 
-   return dev->ops->create_screen(dev, config);
+   return dev->ops->create_screen(dev, &config);
 }
 
 struct util_dl_library *
-pipe_loader_find_module(struct pipe_loader_device *dev,
+pipe_loader_find_module(const char *driver_name,
                         const char *library_paths)
 {
    struct util_dl_library *lib;
@@ -127,22 +138,24 @@ pipe_loader_find_module(struct pipe_loader_device *dev,
    int len, ret;
 
    for (next = library_paths; *next; library_paths = next + 1) {
-      next = util_strchrnul(library_paths, ':');
+      next = strchrnul(library_paths, ':');
       len = next - library_paths;
 
       if (len)
-         ret = util_snprintf(path, sizeof(path), "%.*s/%s%s%s",
-                             len, library_paths,
-                             MODULE_PREFIX, dev->driver_name, UTIL_DL_EXT);
+         ret = snprintf(path, sizeof(path), "%.*s/%s%s%s",
+                        len, library_paths,
+                        MODULE_PREFIX, driver_name, UTIL_DL_EXT);
       else
-         ret = util_snprintf(path, sizeof(path), "%s%s%s",
-                             MODULE_PREFIX, dev->driver_name, UTIL_DL_EXT);
+         ret = snprintf(path, sizeof(path), "%s%s%s",
+                        MODULE_PREFIX, driver_name, UTIL_DL_EXT);
 
-      if (ret > 0 && ret < sizeof(path)) {
+      if (ret > 0 && ret < sizeof(path) && u_file_access(path, 0) != -1) {
          lib = util_dl_open(path);
          if (lib) {
             return lib;
          }
+         fprintf(stderr, "ERROR: Failed to load pipe driver at `%s': %s\n",
+                         path, util_dl_error());
       }
    }