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

pipe-loader: extract a standalone get_driver_descriptor helper function

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-06-30 11:06:44 +02:00
parent 0d7d60b7ea
commit aa222e21c2
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
View File

@@ -156,6 +156,31 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
}; };
#endif #endif
static const struct drm_driver_descriptor *
get_driver_descriptor(const char *driver_name, struct util_dl_library **plib)
{
#ifdef GALLIUM_STATIC_TARGETS
for (int i = 0; i < ARRAY_SIZE(driver_descriptors); i++) {
if (strcmp(driver_descriptors[i].driver_name, driver_name) == 0)
return &driver_descriptors[i];
}
#else
*plib = pipe_loader_find_module(driver_name, PIPE_SEARCH_DIR);
if (!*plib)
return NULL;
const struct drm_driver_descriptor *dd =
(const struct drm_driver_descriptor *)
util_dl_get_proc_address(*plib, "driver_descriptor");
/* sanity check on the driver name */
if (dd && strcmp(dd->driver_name, driver_name) == 0)
return dd;
#endif
return NULL;
}
bool bool
pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd) pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd)
{ {
@@ -179,27 +204,13 @@ pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd)
if (!ddev->base.driver_name) if (!ddev->base.driver_name)
goto fail; goto fail;
#ifdef GALLIUM_STATIC_TARGETS struct util_dl_library **plib = NULL;
for (int i = 0; i < ARRAY_SIZE(driver_descriptors); i++) { #ifndef GALLIUM_STATIC_TARGETS
if (strcmp(driver_descriptors[i].driver_name, ddev->base.driver_name) == 0) { plib = &ddev->lib;
ddev->dd = &driver_descriptors[i]; #endif
break; ddev->dd = get_driver_descriptor(ddev->base.driver_name, plib);
}
}
if (!ddev->dd) if (!ddev->dd)
goto fail; goto fail;
#else
ddev->lib = pipe_loader_find_module(&ddev->base, PIPE_SEARCH_DIR);
if (!ddev->lib)
goto fail;
ddev->dd = (const struct drm_driver_descriptor *)
util_dl_get_proc_address(ddev->lib, "driver_descriptor");
/* sanity check on the driver name */
if (!ddev->dd || strcmp(ddev->dd->driver_name, ddev->base.driver_name) != 0)
goto fail;
#endif
*dev = &ddev->base; *dev = &ddev->base;
return true; return true;