Mesa (main): gbm: Inline load_backend function content
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jul 6 17:27:20 UTC 2021
Module: Mesa
Branch: main
Commit: b45cc75406080416d02e04eddd9affb240a904fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b45cc75406080416d02e04eddd9affb240a904fe
Author: James Jones <jajones at nvidia.com>
Date: Fri Dec 13 15:54:53 2019 -0800
gbm: Inline load_backend function content
It was a functional no-op with the currently
available backends (Only DRI), and its implied
intended functionality is implemented elsewhere
in subsequent patches.
Signed-off-by: James Jones <jajones at nvidia.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9902>
---
src/gbm/main/backend.c | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c
index 37ec9c16f40..029a177fe64 100644
--- a/src/gbm/main/backend.c
+++ b/src/gbm/main/backend.c
@@ -39,28 +39,13 @@ extern const struct gbm_backend gbm_dri_backend;
struct backend_desc {
const char *name;
- const struct gbm_backend *builtin;
+ const struct gbm_backend *backend;
};
static const struct backend_desc backends[] = {
{ "gbm_dri.so", &gbm_dri_backend },
};
-static const void *
-load_backend(const struct backend_desc *backend)
-{
- const void *init = NULL;
-
- if (backend == NULL)
- return NULL;
-
- if (backend->builtin) {
- init = backend->builtin;
- }
-
- return init;
-}
-
static const struct backend_desc *
find_backend(const char *name)
{
@@ -80,24 +65,22 @@ find_backend(const char *name)
struct gbm_device *
_gbm_create_device(int fd)
{
- const struct gbm_backend *backend = NULL;
+ const struct backend_desc *backend = NULL;
struct gbm_device *dev = NULL;
unsigned i;
const char *b;
b = getenv("GBM_BACKEND");
if (b)
- backend = load_backend(find_backend(b));
+ backend = find_backend(b);
if (backend)
- dev = backend->create_device(fd);
+ dev = backend->backend->create_device(fd);
for (i = 0; i < ARRAY_SIZE(backends) && dev == NULL; ++i) {
- backend = load_backend(&backends[i]);
- if (backend == NULL)
- continue;
+ backend = &backends[i];
- dev = backend->create_device(fd);
+ dev = backend->backend->create_device(fd);
}
return dev;
More information about the mesa-commit
mailing list