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

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

Modified Files:
	org_lwjgl_opengl_NVHalfFloat.cpp 
	org_lwjgl_opengl_NVHalfFloat.h 
Log Message:
Removed VertexWeight

Index: org_lwjgl_opengl_NVHalfFloat.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_NVHalfFloat.cpp	8 Feb 2004 20:28:49 -0000	1.1
+++ org_lwjgl_opengl_NVHalfFloat.cpp	29 Feb 2004 23:27:13 -0000	1.2
@@ -72,8 +72,6 @@
 typedef void (APIENTRY * glFogCoordhvNVPROC) (const GLhalf *fog);
 typedef void (APIENTRY * glSecondaryColor3hNVPROC) (GLhalf red, GLhalf green, GLhalf blue);
 typedef void (APIENTRY * glSecondaryColor3hvNVPROC) (const GLhalf *v);
-typedef void (APIENTRY * glVertexWeighthNVPROC) (GLhalf weight);
-typedef void (APIENTRY * glVertexWeighthvNVPROC) (const GLhalf *weight);
 typedef void (APIENTRY * glVertexAttrib1hNVPROC) (GLuint index, GLhalf x);
 typedef void (APIENTRY * glVertexAttrib1hvNVPROC) (GLuint index, const GLhalf *v);
 typedef void (APIENTRY * glVertexAttrib2hNVPROC) (GLuint index, GLhalf x, GLhalf y);
@@ -119,8 +117,6 @@
 static glFogCoordhvNVPROC glFogCoordhvNV;
 static glSecondaryColor3hNVPROC glSecondaryColor3hNV;
 static glSecondaryColor3hvNVPROC glSecondaryColor3hvNV;
-static glVertexWeighthNVPROC glVertexWeighthNV;
-static glVertexWeighthvNVPROC glVertexWeighthvNV;
 static glVertexAttrib1hNVPROC glVertexAttrib1hNV;
 static glVertexAttrib1hvNVPROC glVertexAttrib1hvNV;
 static glVertexAttrib2hNVPROC glVertexAttrib2hNV;
@@ -171,8 +167,6 @@
 	glFogCoordhvNV = (glFogCoordhvNVPROC) extgl_GetProcAddress("glFogCoordhvNV");
 	glSecondaryColor3hNV = (glSecondaryColor3hNVPROC) extgl_GetProcAddress("glSecondaryColor3hNV");
 	glSecondaryColor3hvNV = (glSecondaryColor3hvNVPROC) extgl_GetProcAddress("glSecondaryColor3hvNV");
-	glVertexWeighthNV = (glVertexWeighthNVPROC) extgl_GetProcAddress("glVertexWeighthNV");
-	glVertexWeighthvNV = (glVertexWeighthvNVPROC) extgl_GetProcAddress("glVertexWeighthvNV");
 	glVertexAttrib1hNV = (glVertexAttrib1hNVPROC) extgl_GetProcAddress("glVertexAttrib1hNV");
 	glVertexAttrib1hvNV = (glVertexAttrib1hvNVPROC) extgl_GetProcAddress("glVertexAttrib1hvNV");
 	glVertexAttrib2hNV = (glVertexAttrib2hNVPROC) extgl_GetProcAddress("glVertexAttrib2hNV");
@@ -383,18 +377,6 @@
 
 /*
  * Class:	org.lwjgl.opengl.NVHalfFloat
- * Method:	glVertexWeighthNV
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexWeighthNV
-	(JNIEnv * env, jclass clazz, jshort weight)
-{
-	CHECK_EXISTS(glVertexWeighthNV)
-	glVertexWeighthNV(weight);
-	CHECK_GL_ERROR
-}
-
-/*
- * Class:	org.lwjgl.opengl.NVHalfFloat
  * Method:	glVertexAttrib1hNV
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV

Index: org_lwjgl_opengl_NVHalfFloat.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_NVHalfFloat.h	8 Feb 2004 20:28:48 -0000	1.1
+++ org_lwjgl_opengl_NVHalfFloat.h	29 Feb 2004 23:27:13 -0000	1.2
@@ -157,13 +157,6 @@
 
 /*
  * Class:	org.lwjgl.opengl.NVHalfFloat
- * Method:	glVertexWeighthNV
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexWeighthNV
-	(JNIEnv *, jclass, jshort);
-
-/*
- * Class:	org.lwjgl.opengl.NVHalfFloat
  * Method:	glVertexAttrib1hNV
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19553

Modified Files:
	NVHalfFloat.java 
Log Message:
Removed VertexWeight

Index: NVHalfFloat.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/NVHalfFloat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NVHalfFloat.java	18 Feb 2004 23:54:45 -0000	1.2
+++ NVHalfFloat.java	29 Feb 2004 23:19:55 -0000	1.3
@@ -83,8 +83,6 @@
 
 	public static native void glSecondaryColor3hNV(short red, short green, short blue);
 
-	public static native void glVertexWeighthNV(short weight);
-
 	public static native void glVertexAttrib1hNV(int index, short x);
 
 	public static native void glVertexAttrib2hNV(int index, short x, short y);

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

Modified Files:
	extgl.cpp org_lwjgl_opengl_GLContext.cpp 
Log Message:
Moved init of glXGetProcAddress to extgl_Open

Index: extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- extgl.cpp	28 Feb 2004 16:59:30 -0000	1.22
+++ extgl.cpp	29 Feb 2004 08:24:56 -0000	1.23
@@ -1064,9 +1064,6 @@
 	int major, minor;
 	/* Assume glx ver >= 1.2 */
 	extgl_Extensions.GLX12 = true;
-	glXGetProcAddressARB = (glXGetProcAddressARBPROC) dlsym(lib_gl_handle, "glXGetProcAddressARB");
-	if (glXGetProcAddressARB == NULL)
-		return false;
 	if (!extgl_InitGLX12())
 		return false;
 	extgl_InitGLXSupportedExtensions(env, disp, screen);
@@ -1273,10 +1270,6 @@
 /* extgl_Init the extensions and load all the functions */
 bool extgl_Initialize(JNIEnv *env, jobject ext_set)
 {
-	if (!extgl_Open()) {
-		return false;
-	}
-
 	extgl_error = false;
 	extgl_InitOpenGL1_1();
 	if (extgl_error)
@@ -1377,6 +1370,11 @@
 		printfDebug("Error loading libGL.so.1: %s\n", dlerror());
 		return false;
 	}
+	glXGetProcAddressARB = (glXGetProcAddressARBPROC) dlsym(lib_gl_handle, "glXGetProcAddressARB");
+	if (glXGetProcAddressARB == NULL) {
+		extgl_Close();
+		return false;
+	}
 	return true;
 }
 

Index: org_lwjgl_opengl_GLContext.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLContext.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GLContext.cpp	24 Feb 2004 14:31:35 -0000	1.2
+++ org_lwjgl_opengl_GLContext.cpp	29 Feb 2004 08:24:56 -0000	1.3
@@ -42,7 +42,12 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLContext_init
   (JNIEnv * env, jclass clazz, jobject exts)
 {
+	if (!extgl_Open()) {
+		throwException(env, "Failed to load OpenGL library");
+		return;
+	}
 	if (!extgl_Initialize(env, exts)) {
 		throwException(env, "Failed to initialize GL extensions");
+		return;
 	}
 }