OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/drm: Make the pipe loader handle the driconf merging.

Browse Source 
We can pretty easily handle merging the driver's driconf with the common
driverconf right there, rather than pushing that to each driver.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6751>
This commit is contained in:
Eric Anholt
2020-09-16 10:33:02 -07:00
parent 87392385b5
commit 974981c4e6
13 changed files with 33 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/gallium/auxiliary/pipe-loader/pipe_loader.c
View File

@@ -52,9 +52,7 @@ static int (*backends[])(struct pipe_loader_device **, int) = {
};
const char gallium_driinfo_xml[] =
DRI_CONF_BEGIN
#include "driinfo_gallium.h"
DRI_CONF_END
;
int
@@ -93,26 +91,39 @@ pipe_loader_load_options(struct pipe_loader_device *dev)
if (dev->option_info.info)
return;
const char *xml_options = dev->ops->get_driconf_xml(dev);
if (!xml_options)
xml_options = gallium_driinfo_xml;
const char *driver_xml = dev->ops->get_driconf_xml(dev);
driParseOptionInfo(&dev->option_info, xml_options);
driParseConfigFiles(&dev->option_cache, &dev->option_info, 0,
dev->driver_name, NULL, NULL, 0, NULL, 0);
char *xml_options;
int ret = asprintf(&xml_options, "%s%s%s%s",
DRI_CONF_BEGIN,
gallium_driinfo_xml,
driver_xml ? driver_xml : "",
DRI_CONF_END);
if (ret >= 0) {
driParseOptionInfo(&dev->option_info, xml_options);
driParseConfigFiles(&dev->option_cache, &dev->option_info, 0,
dev->driver_name, NULL, NULL, 0, NULL, 0);
free(xml_options);
}
}
char *
pipe_loader_get_driinfo_xml(const char *driver_name)
{
#ifdef HAVE_LIBDRM
char *xml = pipe_loader_drm_get_driinfo_xml(driver_name);
char *driver_xml = pipe_loader_drm_get_driinfo_xml(driver_name);
#else
char *xml = NULL;
char *driver_xml = NULL;
#endif
if (!xml)
xml = strdup(gallium_driinfo_xml);
char *xml;
int ret = asprintf(&xml, "%s%s%s%s",
DRI_CONF_BEGIN,
gallium_driinfo_xml,
driver_xml ? driver_xml : "",
DRI_CONF_END);
if (ret < 0)
xml = NULL;
return xml;
}