X-Git-Url: https://deadsoftware.ru/gitweb?p=nanogl.git;a=blobdiff_plain;f=nanogl.cpp;h=fdc2a9a8543a7d17b4d909c7fa40a09cd5d9efd0;hp=25ab85dbd57311a8ea460a57e8c317ccd171918e;hb=HEAD;hpb=472a91567501b466be9161d26025060306f869d2

diff --git a/nanogl.cpp b/nanogl.cpp
index 25ab85d..fdc2a9a 100644
--- a/nanogl.cpp
+++ b/nanogl.cpp
@@ -44,19 +44,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #else
 #ifndef _MSC_VER
 #define LOGI( ... )             \
-	printf( "I: "__VA_ARGS__ ); \
+	printf( "I: " __VA_ARGS__ ); \
 	printf( "\n" )
 #define LOGD( ... )                 \
 	if ( DEBUG_NANO )               \
 	{                               \
-		printf( "D: "__VA_ARGS__ ); \
+		printf( "D: " __VA_ARGS__ ); \
 		printf( "\n" );             \
 	}
 #define LOGE( ... )             \
-	printf( "E: "__VA_ARGS__ ); \
+	printf( "E: " __VA_ARGS__ ); \
 	printf( "\n" )
 #define LOGW( ... )             \
-	printf( "W: "__VA_ARGS__ ); \
+	printf( "W: " __VA_ARGS__ ); \
 	printf( "\n" )
 #else
 #define LOGI printf
@@ -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 );