Change getProcAddress search order

diff --git a/nanogl.cpp b/nanogl.cpp
index 25ab85dbd57311a8ea460a57e8c317ccd171918e..90fa364ca1c75e308643ddcd4e227347bce2ffcc 100644 (file)
--- a/nanogl.cpp
+++ b/nanogl.cpp
@@ -135,14 +135,13 @@ void *nanoGL_GetProcAddress( const char *name )
        addr = SDL_GL_GetProcAddress( name );
        if ( !addr )
 #endif
+       addr = procAddress( glesLib, name );
 #ifdef NANOGL_EGL
-       if( glEsImpl->eglGetProcAddress )
-               addr = (void *)glEsImpl->eglGetProcAddress( name );
        if( !addr )
                addr = procAddress( eglLib, name );
-       if( !addr )
+       if( !addr && glEsImpl->eglGetProcAddress )
+               addr = (void *)glEsImpl->eglGetProcAddress( name );
 #endif
-               addr = procAddress( glesLib, name );
        return addr;
 }
 
@@ -157,6 +156,7 @@ int nanoGL_Init( void)
        // alloc space
        if ( !glEsImpl )
                glEsImpl = (GlESInterface *)malloc( sizeof( GlESInterface ) );
+       memset( glEsImpl, 0, sizeof( GlESInterface ) );
 
 #ifdef NANOGL_EGL
        eglLib = loadDriver( EGL_LIB );