radeonsi: stop using TGSI_PROPERTY_TCS_VERTICES_OUT

[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 b435486903ca255d796a8db3bb09963c4530f132..ede92e50263f6baa456e325f6660fe2b240c4b04 100644 (file)
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
@@ -33,7 +33,7 @@
 #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>
 
@@ -99,7 +99,7 @@ pipe_loader_load_options(struct pipe_loader_device *dev)
 
    driParseOptionInfo(&dev->option_info, xml_options);
    driParseConfigFiles(&dev->option_cache, &dev->option_info, 0,
-                       dev->driver_name, NULL);
+                       dev->driver_name, NULL, NULL, 0, NULL, 0);
 }
 
 char *
@@ -142,12 +142,12 @@ pipe_loader_find_module(const char *driver_name,
       len = next - library_paths;
 
       if (len)
-         ret = util_snprintf(path, sizeof(path), "%.*s/%s%s%s",
-                             len, library_paths,
-                             MODULE_PREFIX, 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, 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) && u_file_access(path, 0) != -1) {
          lib = util_dl_open(path);