Module: Mesa Branch: master Commit: 0c73a3b7d0cceb4ba06274b7bd3cf50fb73d48f1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c73a3b7d0cceb4ba06274b7bd3cf50fb73d48f1
Author: Christian Gmeiner <[email protected]> Date: Wed Nov 9 15:50:06 2016 +0100 dri: make use of loader_get_extensions_name(..) helper Changes since v1: - removed not needed includes - use the loader version of the helper v2 [Emil Velikov] - Keep the includes - they are required. Signed-off-by: Christian Gmeiner <[email protected]> Signed-off-by: Emil Velikov <[email protected]> --- src/egl/drivers/dri2/egl_dri2.c | 5 +++-- src/gbm/backends/dri/gbm_dri.c | 4 ++-- src/glx/dri_common.c | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index d9e2ad7..f18e9fb 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -56,6 +56,7 @@ #endif #include "egl_dri2.h" +#include "loader/loader.h" #include "util/u_atomic.h" /* The kernel header drm_fourcc.h defines the DRM formats below. We duplicate @@ -514,8 +515,8 @@ 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 = loader_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..96a1f87 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -363,8 +363,8 @@ 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 = loader_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..854733a 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 = loader_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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
