Changeset 406 for trunk/src/lib/gl.cc

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/lib/gl.cc (modified) (8 diffs)

trunk/src/lib/gl.cc

@@ -82 +82 @@
         if ( gl_library_loaded && !force_reload ) return true;
 #if defined( NV_SDL_GL )
-#               define NV_GL_LOAD( symbol ) *(void **) (&symbol) = SDL_GL_GetProcAddress(#symbol);
-#               define NV_GL_LOAD_EXT( symbol ) *(void **) (&symbol) = SDL_GL_GetProcAddress(#symbol);
-        *(void **) (&gl_ext_loader) = SDL_GL_GetProcAddress;
+#               define NV_GL_LOAD( symbol ) void_assign( symbol, SDL_GL_GetProcAddress(#symbol) );
+#               define NV_GL_LOAD_EXT( symbol ) void_assign( symbol, SDL_GL_GetProcAddress(#symbol) );
+        void_assign( gl_ext_loader, SDL_GL_GetProcAddress );
 #else
         if ( !gl_library.is_open() ) gl_library.open( path );
 
 #       if NV_PLATFORM == NV_WINDOWS 
-#               define NV_GL_LOAD( symbol ) *(void **) (&symbol) = gl_library.get(#symbol);
-                *(void **) (&gl_ext_loader) = gl_library.get("wglGetProcAddress");
-#               define NV_GL_LOAD_EXT( symbol ) *(void **) (&symbol) = gl_ext_loader(#symbol);
+#               define NV_GL_LOAD( symbol ) void_assign( symbol, gl_library.get(#symbol) );
+                void_assign( gl_ext_loader, gl_library.get( "wglGetProcAddress" ) );
+#               define NV_GL_LOAD_EXT( symbol ) void_assign( symbol, gl_ext_loader(#symbol) );
 #       elif (NV_PLATFORM == NV_LINUX || NV_PLATFORM == NV_APPLE)
-#               define NV_GL_LOAD( symbol ) *(void **) (&symbol) = gl_library.get(#symbol);
-                *(void **) (&gl_ext_loader) = gl_library.get("glXGetProcAddress");
-#               define NV_GL_LOAD_EXT( symbol ) *(void **) (&symbol) = gl_ext_loader(#symbol);
+#               define NV_GL_LOAD( symbol ) void_assign( symbol, gl_library.get(#symbol) );
+                void_assign( gl_ext_loader, gl_library.get("glXGetProcAddress") );
+#               define NV_GL_LOAD_EXT( symbol ) void_assign( symbol, gl_ext_loader(#symbol) );
 #       else
-#               define NV_GL_LOAD( symbol ) *(void **) (&symbol) = gl_library.get(#symbol);
-#               define NV_GL_LOAD_EXT( symbol ) *(void **) (&symbol) = gl_library.get(#symbol);
+#               define NV_GL_LOAD( symbol ) void_assign( symbol, gl_library.get(#symbol) );
+#               define NV_GL_LOAD_EXT( symbol ) void_assign( symbol, gl_library.get(#symbol) );
 #       endif
 #endif
@@ -114 +114 @@
 }
 
+
+
 bool nv::load_wgl_library( const char* path /*= NV_GL_PATH */, bool force_reload )
 {
@@ -119 +121 @@
 #if NV_PLATFORM == NV_WINDOWS 
 #if defined( NV_SDL_GL )
-#               define NV_GL_LOAD( symbol ) *(void **) (&symbol) = SDL_GL_GetProcAddress(#symbol);
-#               define NV_GL_LOAD_EXT( symbol ) *(void **) (&symbol) = SDL_GL_GetProcAddress(#symbol);
-#           define NV_GL_LOAD_REN( fname, rname )  *(void **) (&rname) = SDL_GL_GetProcAddress(#fname);
-        (void **) (&gl_ext_loader) = SDL_GL_GetProcAddress;
+#               define NV_GL_LOAD( symbol ) void_assign( symbol, SDL_GL_GetProcAddress(#symbol) );
+#               define NV_GL_LOAD_EXT( symbol ) void_assign( symbol, SDL_GL_GetProcAddress(#symbol) );
+#           define NV_GL_LOAD_REN( fname, rname )  void_assign( rname, SDL_GL_GetProcAddress(#fname) );
+        void_assign( gl_ext_loader, SDL_GL_GetProcAddress );
 #else // 
         if ( !gl_library.is_open() ) gl_library.open( path );
 
-        *(void **) (&gl_ext_loader) = gl_library.get("wglGetProcAddress");
-#define NV_GL_LOAD( symbol ) *(void **) (&symbol) = gl_library.get(#symbol);
-#define NV_GL_LOAD_EXT( symbol ) *(void **) (&symbol) = gl_ext_loader(#symbol);
-#define NV_GL_LOAD_REN( fname, rname ) *(void **) (&rname) = gl_library.get(#fname);
+        void_assign( gl_ext_loader, gl_library.get("wglGetProcAddress") );
+#define NV_GL_LOAD( symbol ) void_assign( symbol, gl_library.get(#symbol) );
+#define NV_GL_LOAD_EXT( symbol ) void_assign( symbol, gl_ext_loader(#symbol) );
+#define NV_GL_LOAD_REN( fname, rname ) void_assign( rname, gl_library.get(#fname) );
 #endif 
 #       define NV_GL_FUN( rtype, fname, fparams ) NV_GL_LOAD( fname )
@@ -161 +163 @@
         BOOL  (NV_GL_APIENTRY *wgl_deletecontext) (HGLRC)      = nullptr;
 
-        *(void **) &wgl_createcontext = gl_library.get("wglCreateContext");
-        *(void **) &wgl_makecurrent   = gl_library.get("wglMakeCurrent");
-        *(void **) &wgl_deletecontext = gl_library.get("wglDeleteContext");
+        void_assign( wgl_createcontext, gl_library.get("wglCreateContext") );
+        void_assign( wgl_makecurrent,   gl_library.get("wglMakeCurrent") );
+        void_assign( wgl_deletecontext, gl_library.get("wglDeleteContext") );
 
         WNDCLASS wndClass;
@@ -175 +177 @@
         wndClass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
         wndClass.hInstance = hInstance;
-        wndClass.lpfnWndProc = (WNDPROC) DefWindowProc;
+        wndClass.lpfnWndProc = reinterpret_cast<WNDPROC>( DefWindowProc );
         wndClass.lpszClassName = TEXT("Dummy67789");
         wndClass.lpszMenuName = 0;
@@ -253 +255 @@
 
 #       define NV_GL_FUN_EXT( rtype, symbol, fparams ) \
-        *(void **) (&symbol) = load_gl_ext_symbol(#symbol, true, nullptr); \
+        void_assign( symbol, load_gl_ext_symbol(#symbol, true, nullptr) ); \
         count++; if ( !symbol ) fail_count++;
 
@@ -266 +268 @@
         default : {
                 NV_LOG_ERROR( "load_gl_extension - unknown extension \"", name, "\"!" );
-                return nullptr;
+                return false;
         }
         }
@@ -274 +276 @@
         {
                 NV_LOG_NOTICE( "load_gl_extension - extension \"", name, "\" loaded (", count, " symbols)" );
-                gl_loaded_extensions = (gl_extensions)( gl_loaded_extensions | (unsigned)extension );
+                gl_loaded_extensions = gl_extensions( gl_loaded_extensions | static_cast<unsigned>( extension ) );
                 return false;
         }