From 0e7ae395e72c710be7d153c76222633aa8ab7444 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 4 Aug 2020 01:38:02 +0200 Subject: [PATCH] egl: inline _eglGetDriverProc() into eglGetProcAddress() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: --- src/egl/main/eglapi.c | 7 +++++-- src/egl/main/egldriver.c | 9 --------- src/egl/main/egldriver.h | 4 ---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 9c78e9c343e..dc32b249f15 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -163,6 +163,9 @@ _EGL_CHECK_OBJECT(disp, Sync, s, ret) +extern const _EGLDriver _eglDriver; + + struct _egl_entrypoint { const char *name; _EGLProc function; @@ -2703,8 +2706,8 @@ eglGetProcAddress(const char *procname) ret = entrypoint->function; } - if (!ret) - ret = _eglGetDriverProc(procname); + if (!ret && _eglDriver.GetProcAddress) + ret = _eglDriver.GetProcAddress(procname); RETURN_EGL_SUCCESS(NULL, ret); } diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 987b4b333ea..981ca6a79d3 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -80,12 +80,3 @@ _eglInitializeDisplay(_EGLDisplay *disp) disp->Initialized = EGL_TRUE; return true; } - -__eglMustCastToProperFunctionPointerType -_eglGetDriverProc(const char *procname) -{ - if (_eglDriver.GetProcAddress) - return _eglDriver.GetProcAddress(procname); - - return NULL; -} diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 150e3556c04..9cb6323a2e3 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -199,10 +199,6 @@ extern bool _eglInitializeDisplay(_EGLDisplay *disp); -extern __eglMustCastToProperFunctionPointerType -_eglGetDriverProc(const char *procname); - - #ifdef __cplusplus } #endif -- 2.30.2