X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=dispatch%2Fglproc.py;h=488f91279da853bd3b4ce3ad45efbcf5733180bc;hb=c8695f74ce1ee6a93dee4b3f7da5a70a64706c82;hp=301e34c662d293d92ab05eb03e3d43ecb4892896;hpb=632a78d5c90941c896fa3c7156131f27c5a58b24;p=apitrace

diff --git a/dispatch/glproc.py b/dispatch/glproc.py
index 301e34c..488f912 100644
--- a/dispatch/glproc.py
+++ b/dispatch/glproc.py
@@ -494,7 +494,7 @@ class GlDispatcher(Dispatcher):
     def header(self):
         print '''
 #if defined(_WIN32)
-extern HINSTANCE _libGlHandle;
+extern HMODULE _libGlHandle;
 #else
 extern void * _libGlHandle;
 #endif
@@ -503,7 +503,7 @@ void * _getPublicProcAddress(const char *procName);
 void * _getPrivateProcAddress(const char *procName);
 '''
         
-    def isFunctionPublic(self, function):
+    def isFunctionPublic(self, module, function):
         return function.name in public_symbols or function.name.startswith('CGL')
 
 
@@ -519,25 +519,25 @@ if __name__ == '__main__':
     print
     dispatcher.header()
     print
-    dispatcher.dispatch_api(eglapi)
+    dispatcher.dispatchModule(eglapi)
     print
     print '#if defined(_WIN32)'
     print
-    dispatcher.dispatch_api(wglapi)
+    dispatcher.dispatchModule(wglapi)
     print
     print '#elif defined(__APPLE__)'
     print
-    dispatcher.dispatch_api(cglapi)
+    dispatcher.dispatchModule(cglapi)
     print
     print '#elif defined(HAVE_X11)'
     print
-    dispatcher.dispatch_api(glxapi)
+    dispatcher.dispatchModule(glxapi)
     print
     print '#endif'
     print
-    dispatcher.dispatch_api(glapi)
+    dispatcher.dispatchModule(glapi)
     print
-    dispatcher.dispatch_api(glesapi)
+    dispatcher.dispatchModule(glesapi)
     print
 
     print '#endif /* !_GLPROC_HPP_ */'