diff options
Diffstat (limited to 'CNativeCode/OpenGL_misc.c')
-rw-r--r-- | CNativeCode/OpenGL_misc.c | 44 |
1 files changed, 6 insertions, 38 deletions
diff --git a/CNativeCode/OpenGL_misc.c b/CNativeCode/OpenGL_misc.c index babb470..1ed0ef2 100644 --- a/CNativeCode/OpenGL_misc.c +++ b/CNativeCode/OpenGL_misc.c @@ -508,7 +508,6 @@ Java_gl4java_GLContext_gljGetNativeLibVendorNative(JNIEnv *env, jobject obj ) } /** - * Experimental Code, not done yet ! * This one is to upspeed the Offscreen rendering engine for e.g. Swing ! */ JNIEXPORT void JNICALL @@ -603,7 +602,6 @@ Java_gl4java_GLContext_gljReadPixelGL2AWT__IIIIIIIIII_3B ( } /** - * Experimental Code, not done yet ! * This one is to upspeed the Offscreen rendering engine for e.g. Swing ! */ JNIEXPORT void JNICALL @@ -789,42 +787,10 @@ Java_gl4java_GLContext_gljReadPixelGL2AWT__IIIIIIIIII_3I ( JNIEXPORT jboolean JNICALL -Java_gl4java_GLContext_gljFetchOSGLFunctions ( - JNIEnv *env, jclass jclass, - jstring gllibname, jstring glulibname, jboolean force ) -{ - // FIXME: this routine is currently unused by the GL4Java - // implementation and should be removed in a subsequent - // release - const char * gllib; - const char * glulib; - - gllib = (*env)->GetStringUTFChars(env, gllibname, 0); - glulib = (*env)->GetStringUTFChars(env, glulibname, 0); - - strncpy (libGLName, gllib, 798); - strncpy (libGLUName, glulib, 798); - libGLName[799] = 0; - libGLUName[799] = 0; - - (*env)->ReleaseStringUTFChars(env, gllibname, gllib); - (*env)->ReleaseStringUTFChars(env, glulibname, glulib); - -#ifdef _X11_ - fetch_GLX_FUNCS (libGLName, libGLUName, (force==JNI_TRUE)?1:0, 0); -#endif - -#ifdef _WIN32_ - fetch_WGL_FUNCS (libGLName, libGLUName, (force==JNI_TRUE)?1:0, 0); -#endif - - return JNI_TRUE; -} - -JNIEXPORT jboolean JNICALL Java_gl4java_GLContext_gljFetchGLFunctions0 ( JNIEnv *env, jclass jclass, - jstring gllibname, jstring glulibname, jboolean force, jboolean reload ) + jstring gllibname, jstring glulibname, jboolean force, + jboolean reload, jboolean verbose ) { const char * gllib; const char * glulib; @@ -842,7 +808,9 @@ Java_gl4java_GLContext_gljFetchGLFunctions0 ( (*env)->ReleaseStringUTFChars(env, glulibname, glulib); } - fetch_GL_FUNCS (libGLName, libGLUName, (force==JNI_TRUE)?1:0, (reload==JNI_TRUE)?1:0); + fetch_GL_FUNCS (libGLName, libGLUName, + (force==JNI_TRUE)?1:0, (reload==JNI_TRUE)?1:0, + (verbose==JNI_TRUE)?1:0); return JNI_TRUE; } @@ -861,7 +829,7 @@ Java_gl4java_GLContext_gljTestGLProc0 ( #endif res = ( getGLProcAddressHelper(libGLName, libGLUName, - str, &method, 0, verbose)!=NULL )? + str, &method, verbose)!=NULL )? JNI_TRUE:JNI_FALSE; (*env)->ReleaseStringUTFChars(env, name, str); |