Mesa (master): egl: remove unnecessary eglGetProcAddress() fallback

[GitLab Mirror]

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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Jan 10 16:41:38 2019 +0000

egl: remove unnecessary eglGetProcAddress() fallback

No need to add a function that returns `false` only to be cast into
a pointer, we can just use the existing `return NULL` :)

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/egl/main/egldriver.c    | 2 +-
 src/egl/main/eglfallbacks.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index e294c8c5f7d..4dc46b35e95 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -109,7 +109,7 @@ _eglMatchDriver(_EGLDisplay *disp)
 __eglMustCastToProperFunctionPointerType
 _eglGetDriverProc(const char *procname)
 {
-   if (_eglGetDriver())
+   if (_eglGetDriver() && _eglDriver->API.GetProcAddress)
       return _eglDriver->API.GetProcAddress(_eglDriver, procname);
 
    return NULL;
diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c
index bf667af1124..336ca7aee2e 100644
--- a/src/egl/main/eglfallbacks.c
+++ b/src/egl/main/eglfallbacks.c
@@ -76,7 +76,6 @@ _eglInitDriverFallbacks(_EGLDriver *drv)
 
    drv->API.WaitClient = (void*) _eglReturnFalse;
    drv->API.WaitNative = (void*) _eglReturnFalse;
-   drv->API.GetProcAddress = (void*) _eglReturnFalse;
 
    drv->API.GetSyncAttrib = _eglGetSyncAttrib;
 }