Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/native/linux context.c,1.2,1.3 extgl_glx.c,1.4,1.5 extgl_glx.h,1.3,1.4 org_lwjgl_opengl_LinuxCanvasImplementation.c,1.1,1.2 org_lwjgl_opengl_LinuxContextImplementation.c,1.2,1.3 org_lwjgl_opengl_Pbuffer.c,1.13,1.14
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24393/linux Modified Files: context.c extgl_glx.c extgl_glx.h org_lwjgl_opengl_LinuxCanvasImplementation.c org_lwjgl_opengl_LinuxContextImplementation.c org_lwjgl_opengl_Pbuffer.c Log Message: Removed unsued JNIEnv parameter from extgl_QueryExtension Index: extgl_glx.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/extgl_glx.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- extgl_glx.c 23 Feb 2005 14:16:57 -0000 1.4 +++ extgl_glx.c 23 Feb 2005 15:17:50 -0000 1.5 @@ -125,13 +125,13 @@ } /** returns true if the extention is available */ -static bool GLXQueryExtension(JNIEnv* env, Display *disp, int screen, const char *name) +static bool GLXQueryExtension(Display *disp, int screen, const char *name) { const GLubyte *exts = (const GLubyte *)glXQueryExtensionsString(disp, screen); - return extgl_QueryExtension(env, exts, name); + return extgl_QueryExtension(exts, name); } -static void extgl_InitGLX13(JNIEnv *env) +static void extgl_InitGLX13() { ExtFunction functions[] = { {"glXGetFBConfigs", (void*)&glXGetFBConfigs}, @@ -182,15 +182,15 @@ return extgl_InitializeFunctions(sizeof(functions)/sizeof(ExtFunction), functions); } -static void extgl_InitGLXSupportedExtensions(JNIEnv *env, Display *disp, int screen) +static void extgl_InitGLXSupportedExtensions(Display *disp, int screen) { - extension_flags.GLX_EXT_visual_info = GLXQueryExtension(env, disp, screen, "GLX_EXT_visual_info"); - extension_flags.GLX_EXT_visual_rating = GLXQueryExtension(env, disp, screen, "GLX_EXT_visual_rating"); - extension_flags.GLX_SGI_swap_control = GLXQueryExtension(env, disp, screen, "GLX_SGI_swap_control"); - extension_flags.GLX_ARB_multisample = GLXQueryExtension(env, disp, screen, "GLX_ARB_multisample"); + extension_flags.GLX_EXT_visual_info = GLXQueryExtension(disp, screen, "GLX_EXT_visual_info"); + extension_flags.GLX_EXT_visual_rating = GLXQueryExtension(disp, screen, "GLX_EXT_visual_rating"); + extension_flags.GLX_SGI_swap_control = GLXQueryExtension(disp, screen, "GLX_SGI_swap_control"); + extension_flags.GLX_ARB_multisample = GLXQueryExtension(disp, screen, "GLX_ARB_multisample"); } -static void extgl_InitGLXSGISwapControl(JNIEnv *env) +static void extgl_InitGLXSGISwapControl() { ExtFunction functions[] = { {"glXSwapIntervalSGI", (void*)&glXSwapIntervalSGI}}; @@ -198,7 +198,7 @@ extension_flags.GLX_SGI_swap_control = extgl_InitializeFunctions(sizeof(functions)/sizeof(ExtFunction), functions); } -bool extgl_InitGLX(JNIEnv *env, Display *disp, int screen) +bool extgl_InitGLX(Display *disp, int screen) { int major, minor; /* Assume glx ver >= 1.2 */ @@ -209,8 +209,8 @@ return false; if (major > 1 || (major == 1 && minor >= 3)) extension_flags.GLX13 = true; - extgl_InitGLX13(env); - extgl_InitGLXSupportedExtensions(env, disp, screen); - extgl_InitGLXSGISwapControl(env); + extgl_InitGLX13(); + extgl_InitGLXSupportedExtensions(disp, screen); + extgl_InitGLXSGISwapControl(); return true; } Index: org_lwjgl_opengl_LinuxCanvasImplementation.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxCanvasImplementation.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_LinuxCanvasImplementation.c 20 Feb 2005 11:24:22 -0000 1.1 +++ org_lwjgl_opengl_LinuxCanvasImplementation.c 23 Feb 2005 15:17:52 -0000 1.2 @@ -48,7 +48,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxCanvasImplementation_nFindVisualIDFromFormat (JNIEnv *env, jclass clazz, jint screen, jobject pixel_format) { - if (!extgl_InitGLX(env, getDisplay(), screen)) { + if (!extgl_InitGLX(getDisplay(), screen)) { throwException(env, "Could not initialize GLX"); return -1; } Index: org_lwjgl_opengl_Pbuffer.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- org_lwjgl_opengl_Pbuffer.c 23 Feb 2005 11:38:24 -0000 1.13 +++ org_lwjgl_opengl_Pbuffer.c 23 Feb 2005 15:17:52 -0000 1.14 @@ -60,7 +60,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxPbufferPeerInfo_nInitHandle (JNIEnv *env, jclass clazz, jobject peer_info_handle, jint width, jint height, jobject pixel_format) { - if (!extgl_InitGLX(env, getDisplay(), getCurrentScreen()) || !isPbuffersSupported()) { + if (!extgl_InitGLX(getDisplay(), getCurrentScreen()) || !isPbuffersSupported()) { throwException(env, "No Pbuffer support"); return; } Index: org_lwjgl_opengl_LinuxContextImplementation.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxContextImplementation.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_opengl_LinuxContextImplementation.c 22 Feb 2005 13:59:32 -0000 1.2 +++ org_lwjgl_opengl_LinuxContextImplementation.c 23 Feb 2005 15:17:52 -0000 1.3 @@ -109,7 +109,7 @@ X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_handle); X11Context *context_info = (*env)->GetDirectBufferAddress(env, context_handle); - if (!extgl_InitGLX(env, peer_info->display, peer_info->screen)) { + if (!extgl_InitGLX(peer_info->display, peer_info->screen)) { throwException(env, "Could not initialize GLX"); return NULL; } Index: context.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/context.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- context.c 21 Feb 2005 15:35:09 -0000 1.2 +++ context.c 23 Feb 2005 15:17:49 -0000 1.3 @@ -247,7 +247,7 @@ return false; } X11PeerInfo *peer_info = (*env)->GetDirectBufferAddress(env, peer_info_handle); - if (!extgl_InitGLX(env, display, screen)) { + if (!extgl_InitGLX(display, screen)) { throwException(env, "Could not init GLX"); return false; } Index: extgl_glx.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/extgl_glx.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- extgl_glx.h 17 Feb 2005 12:39:32 -0000 1.3 +++ extgl_glx.h 23 Feb 2005 15:17:51 -0000 1.4 @@ -365,6 +365,6 @@ extern glXSwapIntervalSGIPROC glXSwapIntervalSGI; -extern bool extgl_InitGLX(JNIEnv *env, Display *disp, int screen); +extern bool extgl_InitGLX(Display *disp, int screen); #endif |
