[Mesa-dev] [PATCH 2/3] dri: make use of dri_get_extensions_name(..) helper
Christian Gmeiner
christian.gmeiner at gmail.com
Thu Nov 3 14:25:21 UTC 2016
Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
---
src/egl/drivers/dri2/egl_dri2.c | 5 +++--
src/gbm/backends/dri/gbm_dri.c | 5 +++--
src/glx/dri_common.c | 5 ++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index d9e2ad7..593dd01 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -514,8 +514,9 @@ dri2_open_driver(_EGLDisplay *disp)
_eglLog(_EGL_DEBUG, "DRI2: dlopen(%s)", path);
- if (asprintf(&get_extensions_name, "%s_%s",
- __DRI_DRIVER_GET_EXTENSIONS, dri2_dpy->driver_name) != -1) {
+ get_extensions_name = dri_get_extensions_name(dri2_dpy->driver_name);
+
+ if (get_extensions_name) {
get_extensions = dlsym(dri2_dpy->driver, get_extensions_name);
if (get_extensions) {
extensions = get_extensions();
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index 5cd7318..4cb7f27 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -363,8 +363,9 @@ dri_open_driver(struct gbm_dri_device *dri)
return NULL;
}
- if (asprintf(&get_extensions_name, "%s_%s",
- __DRI_DRIVER_GET_EXTENSIONS, dri->base.driver_name) != -1) {
+ get_extensions_name = dri_get_extensions_name(dri->base.driver_name);
+
+ if (get_extensions_name) {
const __DRIextension **(*get_extensions)(void);
get_extensions = dlsym(dri->driver, get_extensions_name);
diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index 6728d38..67cf3c8 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -161,10 +161,9 @@ driGetDriverExtensions(void *handle, const char *driver_name)
{
const __DRIextension **extensions = NULL;
const __DRIextension **(*get_extensions)(void);
- char *get_extensions_name;
+ char *get_extensions_name = dri_get_extensions_name(driver_name);
- if (asprintf(&get_extensions_name, "%s_%s",
- __DRI_DRIVER_GET_EXTENSIONS, driver_name) != -1) {
+ if (get_extensions_name) {
get_extensions = dlsym(handle, get_extensions_name);
if (get_extensions) {
free(get_extensions_name);
--
2.7.4
More information about the mesa-dev
mailing list