[PATCH 2/5] wineandroid: Remove now unnecessary wine_get_wgl_driver init guard.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/wineandroid.drv/android.h |  2 +-
 dlls/wineandroid.drv/init.c    |  9 ---------
 dlls/wineandroid.drv/opengl.c  | 32 ++++++++++++--------------------
 3 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h
index 26c6cd9ad20..e3b5467ced1 100644
--- a/dlls/wineandroid.drv/android.h
+++ b/dlls/wineandroid.drv/android.h
@@ -56,7 +56,7 @@ DECL_FUNCPTR( ANativeWindow_release );
 extern pthread_mutex_t drawable_mutex;
 extern void update_gl_drawable( HWND hwnd );
 extern void destroy_gl_drawable( HWND hwnd );
-extern struct opengl_funcs *get_wgl_driver( UINT version );
+extern struct opengl_funcs *ANDROID_wine_get_wgl_driver( UINT version );

/**************************************************************************
diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c
index dbc3de1d933..1211ccd102b 100644
--- a/dlls/wineandroid.drv/init.c
+++ b/dlls/wineandroid.drv/init.c
@@ -294,15 +294,6 @@ UINT ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag
 }

-/**********************************************************************
- *           ANDROID_wine_get_wgl_driver
- */
-static struct opengl_funcs *ANDROID_wine_get_wgl_driver( UINT version )
-{
-    return get_wgl_driver( version );
-}
-
-
 static const struct user_driver_funcs android_drv_funcs =
 {
     .dc_funcs.pCreateCompatibleDC = ANDROID_CreateCompatibleDC,
diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c
index 7981b9be9ee..e3315fc805c 100644
--- a/dlls/wineandroid.drv/opengl.c
+++ b/dlls/wineandroid.drv/opengl.c
@@ -958,24 +958,28 @@ static void init_extensions(void)
 #undef REDIRECT
 }

-static BOOL egl_init(void)
+/**********************************************************************
+ *           ANDROID_wine_get_wgl_driver
+ */
+struct opengl_funcs *ANDROID_wine_get_wgl_driver( UINT version )
 {
-    static int retval = -1;
     EGLConfig *configs;
     EGLint major, minor, count, i, pass;

-    if (retval != -1) return retval;
-    retval = 0;
-
+    if (version != WINE_WGL_DRIVER_VERSION)
+    {
+        ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_WGL_DRIVER_VERSION );
+        return NULL;
+    }
     if (!(egl_handle = dlopen( SONAME_LIBEGL, RTLD_NOW|RTLD_GLOBAL )))
     {
         ERR( "failed to load %s: %s\n", SONAME_LIBEGL, dlerror() );
-        return FALSE;
+        return NULL;
     }
     if (!(opengl_handle = dlopen( SONAME_LIBGLESV2, RTLD_NOW|RTLD_GLOBAL )))
     {
         ERR( "failed to load %s: %s\n", SONAME_LIBGLESV2, dlerror() );
-        return FALSE;
+        return NULL;
     }

#define LOAD_FUNCPTR(func) do { \
@@ -1042,8 +1046,7 @@ static BOOL egl_init(void)
     }

init_extensions();
-    retval = 1;
-    return TRUE;
+    return &egl_funcs;
 }

@@ -1078,14 +1081,3 @@ static struct opengl_funcs egl_funcs =
     { ALL_WGL_FUNCS }
 #undef USE_GL_FUNC
 };
-
-struct opengl_funcs *get_wgl_driver( UINT version )
-{
-    if (version != WINE_WGL_DRIVER_VERSION)
-    {
-        ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_WGL_DRIVER_VERSION );
-        return NULL;
-    }
-    if (!egl_init()) return NULL;
-    return &egl_funcs;
-}