fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-25 02:40:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

util/xmlconfig: drop driInjectDataDir() now that DRIRC_CONFIGDIR is always supported

Browse source 
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:
Eric Engestrom 2023-10-13 17:29:54 +01:00 • committed by Marge Bot
parent 128c2bdf73
commit 44b0764930
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/util/tests/xmlconfig.cpp
View file

@ -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[] = {

6
src/util/xmlconfig.c
View file

@ -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)
{

1
src/util/xmlconfig.h
View file

@ -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);
/**