Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/native/common extal.cpp,1.7,1.8 extal.h,1.19,1.20 extgl.c,1.19,1.20 extgl.h,1.13,1.14
|
From: Elias N. <eli...@us...> - 2003-09-07 16:11:23
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv31051/common Modified Files: extal.cpp extal.h extgl.c extgl.h Log Message: Index: extal.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- extal.cpp 4 Jul 2003 14:29:02 -0000 1.7 +++ extal.cpp 7 Sep 2003 16:11:15 -0000 1.8 @@ -127,7 +127,7 @@ #ifdef _X11 void* handleOAL; #endif -#ifdef TARGET_OS_MAC +#ifdef _AGL #include <Carbon/Carbon.h> OSStatus oalInitEntryPoints (void); void oalDellocEntryPoints (void); @@ -165,7 +165,7 @@ #ifdef _X11 return dlsym(handleOAL, function); #endif -#ifdef TARGET_OS_MAC +#ifdef _AGL return CFBundleGetFunctionPointerForName (handleOAL,CFStringCreateWithCStringNoCopy (NULL, function, CFStringGetSystemEncoding (), NULL)); #endif } @@ -191,7 +191,7 @@ #ifdef _X11 handleOAL = dlopen(path_str, RTLD_LAZY); #endif -#ifdef TARGET_OS_MAC +#ifdef _AGL // NOTE: This totally ignores the input array! - SWP oalInitEntryPoints(); #endif @@ -215,7 +215,7 @@ #ifdef _X11 dlclose(handleOAL); #endif -#ifdef TARGET_OS_MAC +#ifdef _AGL oalDellocEntryPoints(); #endif } @@ -431,7 +431,7 @@ return JNI_TRUE; } -#ifdef TARGET_OS_MAC +#ifdef _AGL // ------------------------- OSStatus oalInitEntryPoints (void) { Index: extal.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extal.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- extal.h 7 Sep 2003 13:28:19 -0000 1.19 +++ extal.h 7 Sep 2003 16:11:15 -0000 1.20 @@ -61,12 +61,11 @@ #define ALCAPIENTRY __cdecl #else - #ifdef TARGET_OS_MAC - #if TARGET_OS_MAC + #ifdef _AGL + #if _AGL typedef struct ALCdevice_struct ALCdevice; typedef struct ALCcontext_struct ALCcontext; - #pragma export on #endif #endif #define ALCAPI @@ -116,11 +115,6 @@ #define ALAPIENTRY __cdecl #define AL_CALLBACK #else - #ifdef TARGET_OS_MAC - #if TARGET_OS_MAC - #pragma export on - #endif - #endif #define ALAPI #define ALAPIENTRY #define AL_CALLBACK Index: extgl.c CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- extgl.c 4 Sep 2003 07:23:47 -0000 1.19 +++ extgl.c 7 Sep 2003 16:11:15 -0000 1.20 @@ -774,9 +774,9 @@ glXFreeMemoryNVPROC glXFreeMemoryNV = NULL; #endif /* X11 */ -#ifdef TARGET_OS_MAC +#ifdef _AGL // TODO: find the OSX equivalent of these functions -#endif /* TARGET_OS_MAC */ +#endif /* _AGL */ #endif /* GL_NV_vertex_array_range */ @@ -1359,10 +1359,93 @@ void * lib_glu_handle = NULL; #endif -#ifdef TARGET_OS_MAC -// Note: Not used, there is a CFBundleRef in the header file that handles the -// dynamic load from the GL Framework bundle and this framework include gl -// and glu in the same library +#ifdef _AGL +CFBundleRef gBundleRefOpenGL = NULL; +#endif + +#ifdef _AGL +// ------------------------- +OSStatus aglInitEntryPoints (void) +{ + OSStatus err = noErr; + const Str255 frameworkName = "\pOpenGL.framework"; + FSRefParam fileRefParam; + FSRef fileRef; + CFURLRef bundleURLOpenGL; + memset(&fileRefParam, 0, sizeof(fileRefParam)); + memset(&fileRef, 0, sizeof(fileRef)); + fileRefParam.ioNamePtr = frameworkName; + fileRefParam.newRef = &fileRef; + + // Frameworks directory/folder + // + err = FindFolder (kSystemDomain, kFrameworksFolderType, false, &fileRefParam.ioVRefNum, &fileRefParam.ioDirID); + if (noErr != err) + { + DebugStr ("\pCould not find frameworks folder"); + return err; + } + + // make FSRef for folder + // + err = PBMakeFSRefSync (&fileRefParam); + + + if (noErr != err) + { + DebugStr ("\pCould make FSref to frameworks folder"); + return err; + } + + // create URL to folder + // + bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault, &fileRef); + if (!bundleURLOpenGL) + { + DebugStr ("\pCould create OpenGL Framework bundle URL"); + return paramErr; + } + + // create ref to GL's bundle + // + gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault,bundleURLOpenGL); + if (!gBundleRefOpenGL) + { + DebugStr ("\pCould not create OpenGL Framework bundle"); + return paramErr; + } + + // release created bundle + // + CFRelease (bundleURLOpenGL); + + // if the code was successfully loaded, look for our function. + if (!CFBundleLoadExecutable (gBundleRefOpenGL)) + { + DebugStr ("\pCould not load MachO executable"); + return paramErr; + } + + return err; +} + + +static void aglDellocEntryPoints (void) +{ + if (gBundleRefOpenGL != NULL) + { + // unload the bundle's code. + CFBundleUnloadExecutable (gBundleRefOpenGL); + CFRelease (gBundleRefOpenGL); + gBundleRefOpenGL = NULL; + } +} + + +static void * aglGetProcAddress (char * pszProc) +{ + return CFBundleGetFunctionPointerForName (gBundleRefOpenGL,CFStringCreateWithCStringNoCopy (NULL, pszProc, CFStringGetSystemEncoding (), NULL)); +} #endif /* getProcAddress */ @@ -1400,7 +1483,7 @@ return t; #endif -#ifdef TARGET_OS_MAC +#ifdef _AGL void *t =(void *)aglGetProcAddress(name); return t; @@ -1560,7 +1643,7 @@ /*-----------------------------------------------------*/ /* AGL stuff BEGIN*/ /*-----------------------------------------------------*/ -#ifdef TARGET_OS_MAC +#ifdef _AGL static int extgl_InitializeAGL() { @@ -3286,7 +3369,7 @@ extgl_InitializeWGL(); #endif -#ifdef TARGET_OS_MAC +#ifdef _AGL /* load AGL extensions */ extgl_InitializeAGL(); #endif @@ -3331,7 +3414,7 @@ } #endif /* WIN32 */ -#ifdef TARGET_OS_MAC +#ifdef _AGL int extgl_Open(void) { OSStatus err = aglInitEntryPoints(); @@ -3347,7 +3430,7 @@ // return 0; } -#endif /* TARGET_OS_MAC */ +#endif /* _AGL */ void extgl_Close(void) { @@ -3359,96 +3442,10 @@ FreeLibrary(lib_gl_handle); FreeLibrary(lib_glu_handle); #endif -#ifdef TARGET_OS_MAC +#ifdef _AGL aglDellocEntryPoints(); #endif } - -#ifdef TARGET_OS_MAC -CFBundleRef gBundleRefOpenGL = NULL; -// ------------------------- -OSStatus aglInitEntryPoints (void) -{ - OSStatus err = noErr; - const Str255 frameworkName = "\pOpenGL.framework"; - FSRefParam fileRefParam; - FSRef fileRef; - CFURLRef bundleURLOpenGL; - memset(&fileRefParam, 0, sizeof(fileRefParam)); - memset(&fileRef, 0, sizeof(fileRef)); - fileRefParam.ioNamePtr = frameworkName; - fileRefParam.newRef = &fileRef; - - // Frameworks directory/folder - // - err = FindFolder (kSystemDomain, kFrameworksFolderType, false, &fileRefParam.ioVRefNum, &fileRefParam.ioDirID); - if (noErr != err) - { - DebugStr ("\pCould not find frameworks folder"); - return err; - } - - // make FSRef for folder - // - err = PBMakeFSRefSync (&fileRefParam); - - - if (noErr != err) - { - DebugStr ("\pCould make FSref to frameworks folder"); - return err; - } - - // create URL to folder - // - bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault, &fileRef); - if (!bundleURLOpenGL) - { - DebugStr ("\pCould create OpenGL Framework bundle URL"); - return paramErr; - } - - // create ref to GL's bundle - // - gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault,bundleURLOpenGL); - if (!gBundleRefOpenGL) - { - DebugStr ("\pCould not create OpenGL Framework bundle"); - return paramErr; - } - - // release created bundle - // - CFRelease (bundleURLOpenGL); - - // if the code was successfully loaded, look for our function. - if (!CFBundleLoadExecutable (gBundleRefOpenGL)) - { - DebugStr ("\pCould not load MachO executable"); - return paramErr; - } - - return err; -} - - -static void aglDellocEntryPoints (void) -{ - if (gBundleRefOpenGL != NULL) - { - // unload the bundle's code. - CFBundleUnloadExecutable (gBundleRefOpenGL); - CFRelease (gBundleRefOpenGL); - gBundleRefOpenGL = NULL; - } -} - - -static void * aglGetProcAddress (char * pszProc) -{ - return CFBundleGetFunctionPointerForName (gBundleRefOpenGL,CFStringCreateWithCStringNoCopy (NULL, pszProc, CFStringGetSystemEncoding (), NULL)); -} -#endif /* turn on the warning for the borland compiler*/ #ifdef __BORLANDC__ Index: extgl.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- extgl.h 23 Aug 2003 11:34:14 -0000 1.13 +++ extgl.h 7 Sep 2003 16:11:15 -0000 1.14 @@ -324,7 +324,7 @@ #endif /* X11 */ -#ifdef TARGET_OS_MAC +#ifdef _AGL #include <Carbon/Carbon.h> #include <OpenGL/gliContext.h> #include <OpenGL/gliDispatch.h> @@ -337,10 +337,10 @@ typedef GDHandle AGLDevice; typedef CGrafPtr AGLDrawable; -OSStatus aglInitEntryPoints(void); +/*OSStatus aglInitEntryPoints(void); void aglDellocEntryPoints (void); void * aglGetProcAddress (char * pszProc); - +*/ typedef AGLPixelFormat (APIENTRY * aglChoosePixelFormatEXTPROC)(const AGLDevice *gdevs, GLint ndev, const GLint *attribs); typedef void (APIENTRY * aglDestroyPixelFormatEXTPROC)(AGLPixelFormat pix); typedef AGLPixelFormat (APIENTRY * aglNextPixelFormatEXTPROC)(AGLPixelFormat pix); @@ -593,7 +593,7 @@ /************************************************************************/ -#endif /* TARGET_OS_MAC */ +#endif /* _AGL */ /*************************************************************/ /* GLU functions */ @@ -5829,11 +5829,11 @@ }; #endif /* X11 */ -#ifdef TARGET_OS_MAC +#ifdef _AGL struct AGLExtensionTypes { }; -#endif /* TARGET_OS_MAC */ +#endif /* _AGL */ struct GLUExtensionTypes { @@ -5851,9 +5851,9 @@ #ifdef _X11 struct GLXExtensionTypes glx; #endif /* X11 */ -#ifdef TARGET_OS_MAC +#ifdef _AGL struct AGLExtensionTypes agl; -#endif /* TARGET_OS_MAC */ +#endif /* _AGL */ struct GLUExtensionTypes glu; int ARB_imaging; @@ -5951,17 +5951,9 @@ /* initializes everything, call this right after the rc is created. the function returns 0 if successful */ int extgl_Initialize(); -#ifdef _X11 int extgl_Open(void); +#ifdef _X11 int extgl_InitGLX(Display *disp, int screen); -#endif - -#ifdef _WIN32 -int extgl_Open(void); -#endif - -#ifdef TARGET_OS_MAC -int extgl_Open(void); #endif void extgl_Close(void); |
