From: Eric Engestrom <eric@engestrom.ch>
Date: Tue, 21 Jul 2020 23:09:56 +0000 (+0200)
Subject: egl: drop unnecessary _eglGetDriver()
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=f91851e6159d9a025aac971b6772ef9904c9d803

egl: drop unnecessary _eglGetDriver()

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6037>
---

diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 2105d83b3da..0a4dae7588e 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -48,18 +48,11 @@
 
 extern _EGLDriver _eglDriver;
 
-static _EGLDriver *
-_eglGetDriver(void)
-{
-   return &_eglDriver;
-}
-
 static _EGLDriver *
 _eglMatchAndInitialize(_EGLDisplay *disp)
 {
-   if (_eglGetDriver())
-      if (_eglDriver.Initialize(&_eglDriver, disp))
-         return &_eglDriver;
+   if (_eglDriver.Initialize(&_eglDriver, disp))
+      return &_eglDriver;
 
    return NULL;
 }
@@ -98,7 +91,7 @@ _eglMatchDriver(_EGLDisplay *disp)
 __eglMustCastToProperFunctionPointerType
 _eglGetDriverProc(const char *procname)
 {
-   if (_eglGetDriver() && _eglDriver.GetProcAddress)
+   if (_eglDriver.GetProcAddress)
       return _eglDriver.GetProcAddress(&_eglDriver, procname);
 
    return NULL;