AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dri: make use of loader_get_extensions_name(..) helper

Browse Source 
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 <christian.gmeiner@gmail.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Christian Gmeiner
2016-11-09 15:50:06 +01:00
committed by Emil Velikov
parent fb10c89877
commit 0c73a3b7d0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/egl/drivers/dri2/egl_dri2.c
+3 -2
View File
@@ -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();
src/gbm/backends/dri/gbm_dri.c
+2 -2
View File
@@ -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);
src/glx/dri_common.c
+2 -3
View File
@@ -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);