java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16841/src/native/linux

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:
Fixed up linux for JOGL integration work

Index: org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- org_lwjgl_opengl_Window.cpp	25 Feb 2004 16:44:45 -0000	1.18
+++ org_lwjgl_opengl_Window.cpp	25 Feb 2004 18:09:10 -0000	1.19
@@ -457,7 +457,7 @@
  * Signature: (IIII)Z
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
-  (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jint samples, jobject ext_set)
+  (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jint samples)
 {
 	int screen;
 	Display *disp;
@@ -493,7 +493,7 @@
 		throwException(env, "Could not create window");
 		return;
 	}
-	if (!extgl_Initialize(env, ext_set)) {
+/*	if (!extgl_Initialize(env, ext_set)) {
 		destroy();
 		throwException(env, "Could not init gl function pointers");
 		return;
@@ -501,7 +501,7 @@
 	if (ISDEBUGENABLED()) {
 		const GLubyte * extensions = glGetString(GL_EXTENSIONS);
 		printf("Supported extensions: %s\n", extensions);
-	}
+	}*/
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16841/src/native/common

Modified Files:
	Makefile.am extgl.cpp extgl.h 
Log Message:
Fixed up linux for JOGL integration work

Index: Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	15 Feb 2004 15:20:32 -0000	1.18
+++ Makefile.am	25 Feb 2004 18:08:57 -0000	1.19
@@ -34,6 +34,7 @@
   org_lwjgl_openal_eax_EAXBufferProperties.h \
   org_lwjgl_openal_eax_EAXListenerProperties.cpp \
   org_lwjgl_openal_eax_EAXListenerProperties.h \
+  org_lwjgl_opengl_GLContext.cpp \
   org_lwjgl_opengl_GL11.cpp \
   org_lwjgl_opengl_GL11.h \
   org_lwjgl_opengl_GL12.cpp \

Index: extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- extgl.cpp	23 Feb 2004 23:42:57 -0000	1.20
+++ extgl.cpp	25 Feb 2004 18:08:57 -0000	1.21
@@ -734,69 +734,40 @@
 }
 
 static bool QueryExtension(JNIEnv *env, jobject ext_set, const GLubyte*extensions, const char *name)
-
 {
-
 	const GLubyte *start;
-
 	GLubyte *where, *terminator;
 
-
-
 	if (extensions == NULL) {
-
 		printfDebug("NULL extension string\n");
-
 		extgl_error = true;
-
 		return false;
-
 	}
 
 	/* Extension names should not have spaces. */
-
 	where = (GLubyte *) strchr(name, ' ');
-
 	if (where || *name == '\0')
-
 		return false;
 
 	/* It takes a bit of care to be fool-proof about parsing the
-
 		 OpenGL extensions string. Don't be fooled by sub-strings,
-
 		etc. */
-
 	start = extensions;
-
 	for (;;)
-
 	{
-
 		where = (GLubyte *) strstr((const char *) start, name);
-
 		if (!where)
-
 			break;
-
 		terminator = where + strlen(name);
-
 		if (where == start || *(where - 1) == ' ')
-
 			if (*terminator == ' ' || *terminator == '\0') {
-
 				if (ext_set != NULL) { 
 					insertExtension(env, ext_set, name);
 				}
-
 				return true;
-
 			}
-
 		start = terminator;
-
 	}
-
 	return false;
 
 }
@@ -976,10 +947,10 @@
 
 #ifdef _X11
 /** returns true if the extention is available */
-static bool GLXQueryExtension(JNIEnv* env, jobject ext_set, Display *disp, int screen, const char *name)
+static bool GLXQueryExtension(JNIEnv* env, Display *disp, int screen, const char *name)
 {
 	const GLubyte *exts = (const GLubyte *)glXQueryExtensionsString(disp, screen);
-	return QueryExtension(env, ext_set, exts, name);
+	return QueryExtension(env, NULL, exts, name);
 }
 #endif
 
@@ -1022,7 +993,7 @@
 */
 
 #ifdef _X11
-static void extgl_InitGLX13(JNIEnv *env, jobject ext_set)
+static void extgl_InitGLX13(JNIEnv *env)
 {
 	if (extgl_Extensions.GLX13 != 1)
 		return;
@@ -1044,7 +1015,7 @@
 	glXQueryContext = (glXQueryContextPROC) extgl_GetProcAddress("glXQueryContext");
 	glXSelectEvent = (glXSelectEventPROC) extgl_GetProcAddress("glXSelectEvent");
 	glXGetSelectedEvent = (glXGetSelectedEventPROC) extgl_GetProcAddress("glXGetSelectedEvent");
-	EXTGL_SANITY_CHECK(env, ext_set, GLX13)
+	EXTGL_SANITY_CHECK(env, (jobject)NULL, GLX13);
 }
 
 static bool extgl_InitGLX12(void)
@@ -1072,23 +1043,23 @@
 	return !extgl_error;
 }
 
-static void extgl_InitGLXSupportedExtensions(JNIEnv *env, jobject ext_set, Display *disp, int screen)
+static void extgl_InitGLXSupportedExtensions(JNIEnv *env, Display *disp, int screen)
 {
-	extgl_Extensions.GLX_EXT_visual_info = GLXQueryExtension(env, ext_set, disp, screen, "GLX_EXT_visual_info");
-	extgl_Extensions.GLX_EXT_visual_rating = GLXQueryExtension(env, ext_set, disp, screen, "GLX_EXT_visual_rating");
-	extgl_Extensions.GLX_SGI_swap_control = GLXQueryExtension(env, ext_set, disp, screen, "GLX_SGI_swap_control");
-	extgl_Extensions.GLX_ARB_multisample = GLXQueryExtension(env, ext_set, disp, screen, "GLX_ARB_multisample");
+	extgl_Extensions.GLX_EXT_visual_info = GLXQueryExtension(env, disp, screen, "GLX_EXT_visual_info");
+	extgl_Extensions.GLX_EXT_visual_rating = GLXQueryExtension(env, disp, screen, "GLX_EXT_visual_rating");
+	extgl_Extensions.GLX_SGI_swap_control = GLXQueryExtension(env, disp, screen, "GLX_SGI_swap_control");
+	extgl_Extensions.GLX_ARB_multisample = GLXQueryExtension(env, disp, screen, "GLX_ARB_multisample");
 }
 
-static void extgl_InitGLXSGISwapControl(JNIEnv *env, jobject ext_set)
+static void extgl_InitGLXSGISwapControl(JNIEnv *env)
 {
 	if (extgl_Extensions.GLX_SGI_swap_control != 1)
 		return;
 	glXSwapIntervalSGI = (glXSwapIntervalSGIPROC)extgl_GetProcAddress("glXSwapIntervalSGI");
-	EXTGL_SANITY_CHECK(env, ext_set, GLX_SGI_swap_control)
+	EXTGL_SANITY_CHECK(env, (jobject)NULL, GLX_SGI_swap_control);
 }
 
-bool extgl_InitGLX(JNIEnv *env, jobject ext_set, Display *disp, int screen)
+bool extgl_InitGLX(JNIEnv *env, Display *disp, int screen)
 {
 	int major, minor;
 	/* Assume glx ver >= 1.2 */
@@ -1098,13 +1069,13 @@
 		return false;
 	if (!extgl_InitGLX12())
 		return false;
-	extgl_InitGLXSupportedExtensions(env, ext_set, disp, screen);
+	extgl_InitGLXSupportedExtensions(env, disp, screen);
 	if (glXQueryVersion(disp, &major, &minor) != True)
 		return false;
 	if (major > 1 || (major == 1 && minor >= 3))
 		extgl_Extensions.GLX13 = true;
-	extgl_InitGLX13(env, ext_set);
-	extgl_InitGLXSGISwapControl(env, ext_set);
+	extgl_InitGLX13(env);
+	extgl_InitGLXSGISwapControl(env);
 	return true;
 }
 #endif

Index: extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- extgl.h	23 Feb 2004 23:42:56 -0000	1.27
+++ extgl.h	25 Feb 2004 18:09:01 -0000	1.28
@@ -3291,7 +3291,7 @@
 void extgl_removeExtension(JNIEnv *env, jobject ext_set, const char *ext);
 
 #define EXTGL_SANITY_CHECK(e,h,x) 	if (extgl_error) { \
-						extgl_Extensions.x = 0; \
+						extgl_Extensions.x = false; \
 						printf("NOTICE: %s disabled because of missing driver symbols\n", #x); \
 						extgl_error = false; \
 						if (h != NULL) { \

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29230/linux

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:
Small linux fix

Index: org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- org_lwjgl_opengl_Window.cpp	18 Feb 2004 17:48:26 -0000	1.17
+++ org_lwjgl_opengl_Window.cpp	25 Feb 2004 16:44:45 -0000	1.18
@@ -475,7 +475,7 @@
 		return;
 	}
 	screen = XDefaultScreen(disp);
-	if (!extgl_InitGLX(env, ext_set, disp, screen)) {
+	if (!extgl_InitGLX(env, disp, screen)) {
 		XCloseDisplay(disp);
 		extgl_Close();
 		throwException(env, "Could not init GLX");