util/xmlconfig: drop driInjectDataDir() now that DRIRC_CONFIGDIR is always supported
Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21808>
This commit is contained in:

committed by
Marge Bot

parent
128c2bdf73
commit
44b0764930
@@ -191,11 +191,6 @@ xmlconfig_test::drirc_init(const char *driver, const char *drm,
|
||||
const char *app, int appver,
|
||||
const char *engine, int enginever)
|
||||
{
|
||||
/* Make the parser look in the directory of config files for the test,
|
||||
* passed in by meson.build.
|
||||
*/
|
||||
driInjectDataDir(getenv("DRIRC_CONFIGDIR"));
|
||||
|
||||
driInjectExecName(exec_name);
|
||||
|
||||
driOptionDescription driconf[] = {
|
||||
|
@@ -1176,12 +1176,6 @@ initOptionCache(driOptionCache *cache, const driOptionCache *info)
|
||||
static const char *datadir = DATADIR "/drirc.d";
|
||||
static const char *execname;
|
||||
|
||||
void
|
||||
driInjectDataDir(const char *dir)
|
||||
{
|
||||
datadir = dir;
|
||||
}
|
||||
|
||||
void
|
||||
driInjectExecName(const char *exec)
|
||||
{
|
||||
|
@@ -159,7 +159,6 @@ float driQueryOptionf(const driOptionCache *cache, const char *name);
|
||||
char *driQueryOptionstr(const driOptionCache *cache, const char *name);
|
||||
|
||||
/* Overrides for the unit tests to control drirc parsing. */
|
||||
void driInjectDataDir(const char *dir);
|
||||
void driInjectExecName(const char *exec);
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user