From 49e56c3c0dfad84405142c1cd046941379ba5e9c Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Apr 2021 12:46:25 -0700 Subject: [PATCH] gbm: Rename backend description list to builtin_backends MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This just makes it clearer the array isn't a global list of all backends in use. Signed-off-by: James Jones Reviewed-by: Michel Dänzer Reviewed-by: Emil Velikov Part-of: --- src/gbm/main/backend.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c index c5824a1..ef9cfd6 100644 --- a/src/gbm/main/backend.c +++ b/src/gbm/main/backend.c @@ -44,7 +44,7 @@ struct gbm_backend_desc { const struct gbm_backend *backend; }; -static const struct gbm_backend_desc backends[] = { +static const struct gbm_backend_desc builtin_backends[] = { { "gbm_dri.so", &gbm_dri_backend }, }; @@ -52,20 +52,23 @@ static struct gbm_device * find_backend(const char *name, int fd) { struct gbm_device *dev = NULL; + const struct gbm_backend_desc *bd; unsigned i; uint32_t abi_ver; - for (i = 0; i < ARRAY_SIZE(backends); ++i) { - if (name && strcmp(backends[i].name, name)) + for (i = 0; i < ARRAY_SIZE(builtin_backends); ++i) { + bd = &builtin_backends[i]; + + if (name && strcmp(bd->name, name)) continue; abi_ver = VER_MIN(GBM_BACKEND_ABI_VERSION, - backends[i].backend->v0.backend_version); - dev = backends[i].backend->v0.create_device(fd, abi_ver); + bd->backend->v0.backend_version); + dev = bd->backend->v0.create_device(fd, abi-ver); if (dev) { assert(abi_ver == dev->v0.backend_version); - dev->v0.backend_desc = &backends[i]; + dev->v0.backend_desc = bd; break; } } -- 2.7.4