Mesa (master): Revert "dri: make use of dri_get_extensions_name(..) helper "

[Emil Velikov]

Module: Mesa
Branch: master
Commit: fb10c8987745cbe69c5f36e9c1c6f2c70b44b761
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb10c8987745cbe69c5f36e9c1c6f2c70b44b761

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue Nov 15 18:01:20 2016 +0000

Revert "dri: make use of dri_get_extensions_name(..) helper"

This reverts commit 1a21d21580965eff751414d140b3c176eeee2eb3.

Pushed the wrong version of the patch.

---

 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, 7 insertions(+), 8 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 593dd01..d9e2ad7 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -514,9 +514,8 @@ dri2_open_driver(_EGLDisplay *disp)
 
    _eglLog(_EGL_DEBUG, "DRI2: dlopen(%s)", path);
 
-   get_extensions_name = dri_get_extensions_name(dri2_dpy->driver_name);
-
-   if (get_extensions_name) {
+   if (asprintf(&get_extensions_name, "%s_%s",
+                __DRI_DRIVER_GET_EXTENSIONS, dri2_dpy->driver_name) != -1) {
       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 4cb7f27..5cd7318 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -363,9 +363,8 @@ dri_open_driver(struct gbm_dri_device *dri)
       return NULL;
    }
 
-   get_extensions_name = dri_get_extensions_name(dri->base.driver_name);
-
-   if (get_extensions_name) {
+   if (asprintf(&get_extensions_name, "%s_%s",
+                __DRI_DRIVER_GET_EXTENSIONS, dri->base.driver_name) != -1) {
       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 67cf3c8..6728d38 100644
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -161,9 +161,10 @@ driGetDriverExtensions(void *handle, const char *driver_name)
 {
    const __DRIextension **extensions = NULL;
    const __DRIextension **(*get_extensions)(void);
-   char *get_extensions_name = dri_get_extensions_name(driver_name);
+   char *get_extensions_name;
 
-   if (get_extensions_name) {
+   if (asprintf(&get_extensions_name, "%s_%s",
+                __DRI_DRIVER_GET_EXTENSIONS, driver_name) != -1) {
       get_extensions = dlsym(handle, get_extensions_name);
       if (get_extensions) {
          free(get_extensions_name);