Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/native/common extgl.cpp,NONE,1.1 Makefile.am,1.11,1.12 extgl.h,1.14,1.15 org_lwjgl_opengl_Window.h,1.5,1.6 extgl.c,1.23,NONE org_lwjgl_opengl_GLCaps.h,1.3,NONE
|
From: Elias N. <eli...@us...> - 2003-09-26 13:59:56
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/native/common Modified Files: Makefile.am extgl.h org_lwjgl_opengl_Window.h Added Files: extgl.cpp Removed Files: extgl.c org_lwjgl_opengl_GLCaps.h Log Message: Don't ignore lying drivers --- NEW FILE: extgl.cpp --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.cpp /* ---------------------------------------------------------------------------- Copyright (c) 2001-2002, Lev Povalahev All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * The name of the author may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, [...3266 lines suppressed...] { #ifdef _X11 dlclose(lib_glu_handle); dlclose(lib_gl_handle); #endif #ifdef _WIN32 FreeLibrary(lib_gl_handle); FreeLibrary(lib_glu_handle); #endif #ifdef _AGL aglDellocEntryPoints(); #endif } /* turn on the warning for the borland compiler*/ #ifdef __BORLANDC__ #pragma warn .8064 #pragma warn .8065 #endif /* __BORLANDC__ */ Index: Makefile.am CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/Makefile.am =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 3 Sep 2003 15:42:37 -0000 1.11 +++ Makefile.am 26 Sep 2003 13:59:49 -0000 1.12 @@ -5,7 +5,7 @@ COMMON = \ extal.cpp \ extal.h \ - extgl.c \ + extgl.cpp \ extgl.h \ org_lwjgl_Display.h \ org_lwjgl_Sys.h \ 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.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- extgl.h 7 Sep 2003 16:11:15 -0000 1.14 +++ extgl.h 26 Sep 2003 13:59:49 -0000 1.15 @@ -165,6 +165,8 @@ #ifndef __EXTGL_H__ #define __EXTGL_H__ +#include <jni.h> + /*-----------------------------------------*/ /*-----------------------------------------*/ @@ -598,9 +600,6 @@ /*************************************************************/ /* GLU functions */ [...1709 lines suppressed...] extern struct ExtensionTypes extgl_Extensions; - /* initializes everything, call this right after the rc is created. the function returns 0 if successful */ -int extgl_Initialize(); -int extgl_Open(void); +bool extgl_Initialize(JNIEnv *env, jobject gl_extensions); +bool extgl_Open(void); #ifdef _X11 -int extgl_InitGLX(Display *disp, int screen); +bool extgl_InitGLX(JNIEnv *env, jobject ext_set, Display *disp, int screen); #endif void extgl_Close(void); - -int glInitialize(); /* deprecated, please do not use */ #ifdef __cplusplus } Index: org_lwjgl_opengl_Window.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- org_lwjgl_opengl_Window.h 17 Aug 2003 18:40:58 -0000 1.5 +++ org_lwjgl_opengl_Window.h 26 Sep 2003 13:59:50 -0000 1.6 @@ -88,10 +88,10 @@ /* * Class: org_lwjgl_opengl_Window * Method: nCreate - * Signature: (Ljava/lang/String;IIIIZIIII)V + * Signature: (Ljava/lang/String;IIIIZIIIILjava/util/Vector;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate - (JNIEnv *, jclass, jstring, jint, jint, jint, jint, jboolean, jint, jint, jint, jint); + (JNIEnv *, jclass, jstring, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jobject); /* * Class: org_lwjgl_opengl_Window --- extgl.c DELETED --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c --- org_lwjgl_opengl_GLCaps.h DELETED --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLCaps.h |
