Expand glutGetProcAddress() to support core GL functions too under Haiku,

now that we do have a way to retrieve such address.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38579 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-09-08 10:41:44 +00:00
parent fafc6e4b77
commit 48933a73b8
2 changed files with 28 additions and 10 deletions
+12
View File
@@ -221,3 +221,15 @@ int glutGetModifiers() {
return gState.modifierKeys; return gState.modifierKeys;
} }
#ifdef __HAIKU__
GLUTproc
__glutGetProcAddress(const char* procName)
{
if (gState.currentWindow)
return (GLUTproc) gState.currentWindow->GetGLProcAddress(procName);
return NULL;
}
#endif
+6
View File
@@ -176,6 +176,10 @@ static struct name_address_pair glut_functions[] = {
}; };
#ifdef __HAIKU__
extern GLUTproc __glutGetProcAddress(const char* procName);
#endif
/* XXX This isn't an official GLUT function, yet */ /* XXX This isn't an official GLUT function, yet */
GLUTproc GLUTAPIENTRY GLUTproc GLUTAPIENTRY
glutGetProcAddress(const char *procName) glutGetProcAddress(const char *procName)
@@ -192,6 +196,8 @@ glutGetProcAddress(const char *procName)
return (GLUTProc) wglGetProcAddress((LPCSTR) procName); return (GLUTProc) wglGetProcAddress((LPCSTR) procName);
#elif defined(GLX_ARB_get_proc_address) #elif defined(GLX_ARB_get_proc_address)
return (GLUTProc) glXGetProcAddressARB((const GLubyte *) procName); return (GLUTProc) glXGetProcAddressARB((const GLubyte *) procName);
#elif defined(__HAIKU__)
return __glutGetProcAddress(procName);
#else #else
return NULL; return NULL;
#endif #endif