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

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

Modified Files:
	BufferObjectTracker.java 
Log Message:
Added BufferObjectTracker.bindVBOBuffer()

Index: BufferObjectTracker.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/BufferObjectTracker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BufferObjectTracker.java	8 Feb 2005 19:12:46 -0000	1.2
+++ BufferObjectTracker.java	9 Feb 2005 14:05:00 -0000	1.3
@@ -81,6 +81,19 @@
 		}
 	}
 
+	static void bindVBOBuffer(int target, int buffer) {
+		switch ( target ) {
+			case GL15.GL_ELEMENT_ARRAY_BUFFER:
+				getVBOElementStack().setState(buffer);
+				break;
+			case GL15.GL_ARRAY_BUFFER:
+				getVBOArrayStack().setState(buffer);
+				break;
+			default:
+				throw new IllegalArgumentException("Unsupported VBO target " + target);
+		}
+	}
+
 	static StateStack getVBOArrayStack() {
 		return current_tracker.vbo_array_stack;
 	}

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

Modified Files:
	BufferChecks.java 
Log Message:
Added BufferChecks.checkNullTerminated

Index: BufferChecks.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/BufferChecks.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BufferChecks.java	7 Feb 2005 18:48:22 -0000	1.3
+++ BufferChecks.java	9 Feb 2005 13:44:52 -0000	1.4
@@ -59,6 +59,15 @@
 	private static final int DEFAULT_BUFFER_SIZE = 4;
 
 	/**
+	 * Helper methods to ensure a ByteBuffer is null-terminated
+	 */
+	public static void checkNullTerminated(ByteBuffer buf) {
+		if (buf.get(buf.limit() - 1) != 0) {
+			throw new IllegalArgumentException("Missing null termination");
+		}
+	}
+
+	/**
 	 * Helper methods to ensure a buffer is direct or null.
 	 */
 	public static void checkDirectOrNull(ByteBuffer buf) {

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

Modified Files:
	org_lwjgl_opengl_GL11.c org_lwjgl_opengl_GL12.c 
	org_lwjgl_opengl_GL15.c 
Log Message:
Win32: Fixed void * pointer arithmetic

Index: org_lwjgl_opengl_GL11.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_opengl_GL11.c	9 Feb 2005 10:57:30 -0000	1.9
+++ org_lwjgl_opengl_GL11.c	9 Feb 2005 12:04:24 -0000	1.10
@@ -2486,7 +2486,7 @@
  */
 static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6, jint p7, jobject buffer, jint offset)
 {
-	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer) + offset;
+	GLvoid *buffer_ptr = (GLvoid *)((char *)safeGetBufferAddress(env, buffer) + offset);
 	glTexImage2D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, (GLint) p7, buffer_ptr);
 }
 
@@ -2505,7 +2505,7 @@
  */
 static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6, jobject buffer, jint offset)
 {
-	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer) + offset;
+	GLvoid *buffer_ptr = (GLvoid *)((char *)safeGetBufferAddress(env, buffer) + offset);
 	glTexImage1D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, buffer_ptr);
 }
 

Index: org_lwjgl_opengl_GL15.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL15.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_GL15.c	9 Feb 2005 10:57:30 -0000	1.2
+++ org_lwjgl_opengl_GL15.c	9 Feb 2005 12:04:25 -0000	1.3
@@ -133,7 +133,7 @@
 static void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData
 	(JNIEnv * env, jclass clazz, jint target, jint size, jobject data, jint data_offset, jint usage)
 {
-	GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data) + data_offset;
+	GLvoid *data_ptr = (GLvoid *)((char *)safeGetBufferAddress(env, data) + data_offset);
 	glBufferData(target, size, data_ptr, usage);
 	
 }

Index: org_lwjgl_opengl_GL12.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL12.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_GL12.c	9 Feb 2005 10:57:30 -0000	1.5
+++ org_lwjgl_opengl_GL12.c	9 Feb 2005 12:04:25 -0000	1.6
@@ -85,7 +85,7 @@
 static void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D
   (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint format, jint type, jobject buffer, jint offset)
 {
-	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer) + offset;
+	GLvoid *buffer_ptr = (GLvoid *)((char *)safeGetBufferAddress(env, buffer) + offset);
 	glTexImage3D(target, level, internalformat, width, height, depth, border, format, type, buffer_ptr);
 }
 

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

Modified Files:
	org_lwjgl_opengl_ATIVertexArrayObject.c 
Log Message:
Win32: Fixed void * pointer arithmetic

Index: org_lwjgl_opengl_ATIVertexArrayObject.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_ATIVertexArrayObject.c	9 Feb 2005 10:57:32 -0000	1.2
+++ org_lwjgl_opengl_ATIVertexArrayObject.c	9 Feb 2005 12:04:24 -0000	1.3
@@ -70,7 +70,7 @@
 static jint JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI
 	(JNIEnv * env, jclass clazz, jint size, jobject pPointer, jint pPointer_offset, jint usage)
 {
-	GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer) + pPointer_offset;
+	GLvoid *pPointer_ptr = (GLvoid *)((char *)safeGetBufferAddress(env, pPointer) + pPointer_offset);
 	GLuint result = glNewObjectBufferATI(size, pPointer_ptr, usage);
 	
 	return result;

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

Modified Files:
	org_lwjgl_opengl_ARBBufferObject.c 
Log Message:
Win32: Fixed void * pointer arithmetic

Index: org_lwjgl_opengl_ARBBufferObject.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_ARBBufferObject.c	9 Feb 2005 10:57:31 -0000	1.2
+++ org_lwjgl_opengl_ARBBufferObject.c	9 Feb 2005 12:04:23 -0000	1.3
@@ -114,7 +114,7 @@
 static void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferDataARB
 	(JNIEnv * env, jclass clazz, jint target, jint size, jobject data, jint data_offset, jint usage)
 {
-	GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data) + data_offset;
+	GLvoid *data_ptr = (GLvoid *)((char *)safeGetBufferAddress(env, data) + data_offset);
 	glBufferDataARB(target, size, data_ptr, usage);
 	
 }

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

Modified Files:
	org_lwjgl_devil_IL.c org_lwjgl_devil_ILU.c 
Log Message:
Moved extension type definitions into extgl.h. Removed offset argument to safeGetBufferAddress

Index: org_lwjgl_devil_IL.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- org_lwjgl_devil_IL.c	12 Dec 2004 10:43:42 -0000	1.14
+++ org_lwjgl_devil_IL.c	9 Feb 2005 10:57:32 -0000	1.15
@@ -172,7 +172,7 @@
  * Signature: (ILjava/nio/IntBuffer;I)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nilDeleteImages(JNIEnv * env, jclass clazz, jint num, jobject lists_buffer, jint lists_offset) {
-    ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, lists_buffer, lists_offset);
+    ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, lists_buffer) + lists_offset;
     ilDeleteImages((ILsizei)num, (ILuint *)lists);
 }
 
@@ -210,7 +210,7 @@
  * Signature: (ILjava/nio/IntBuffer;I)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_devil_IL_nilGenImages(JNIEnv *env , jclass clazz, jint num, jobject lists_buffer, jint lists_offset) {
-    ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, lists_buffer, lists_offset);
+    ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, lists_buffer) + lists_offset;
     ilGenImages((ILsizei)num, (ILuint *)lists);
 }
 
@@ -432,7 +432,7 @@
  * Signature: (ILjava/nio/ByteBuffer;II)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_devil_IL_nilLoadL(JNIEnv *env, jclass clazz, jint type, jobject lump_buffer, jint lump_offset, jint size) {
-    ILbyte *lump = (ILbyte *)safeGetBufferAddress(env, lump_buffer, lump_offset);
+    ILbyte *lump = (ILbyte *)safeGetBufferAddress(env, lump_buffer) + lump_offset;
 
     return ilLoadL((ILenum)type, (ILvoid *)(lump), (ILuint)size);
 }

Index: org_lwjgl_devil_ILU.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/org_lwjgl_devil_ILU.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_devil_ILU.c	12 Jan 2005 12:30:31 -0000	1.2
+++ org_lwjgl_devil_ILU.c	9 Feb 2005 10:57:33 -0000	1.3
@@ -261,7 +261,7 @@
  * Signature: (ILjava/nio/IntBuffer;)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_devil_ILU_iluGetIntegerv(JNIEnv *env, jclass clazz, jint mode, jobject param_buffer, jint param_offset) {
-    ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, param_buffer, param_offset);
+    ILbyte *lists = (ILbyte *) safeGetBufferAddress(env, param_buffer) + param_offset;
     ilGenImages((ILsizei)mode, (ILuint *)lists);
 }
 

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

Modified Files:
	org_lwjgl_opengl_ATIVertexArrayObject.c 
Log Message:
Moved extension type definitions into extgl.h. Removed offset argument to safeGetBufferAddress

Index: org_lwjgl_opengl_ATIVertexArrayObject.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_ATIVertexArrayObject.c	10 Sep 2004 08:13:52 -0000	1.1
+++ org_lwjgl_opengl_ATIVertexArrayObject.c	9 Feb 2005 10:57:32 -0000	1.2
@@ -70,7 +70,7 @@
 static jint JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBufferATI
 	(JNIEnv * env, jclass clazz, jint size, jobject pPointer, jint pPointer_offset, jint usage)
 {
-	GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer, pPointer_offset);
+	GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer) + pPointer_offset;
 	GLuint result = glNewObjectBufferATI(size, pPointer_ptr, usage);
 	
 	return result;

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

Modified Files:
	extgl.h org_lwjgl_opengl_GL15.c org_lwjgl_opengl_GL20.c 
	org_lwjgl_opengl_GL12.c org_lwjgl_opengl_GL11.c common_tools.h 
Log Message:
Moved extension type definitions into extgl.h. Removed offset argument to safeGetBufferAddress

Index: org_lwjgl_opengl_GL11.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL11.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_opengl_GL11.c	8 Feb 2005 19:20:54 -0000	1.8
+++ org_lwjgl_opengl_GL11.c	9 Feb 2005 10:57:30 -0000	1.9
@@ -2486,7 +2486,7 @@
  */
 static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6, jint p7, jobject buffer, jint offset)
 {
-	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer, offset);
+	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer) + offset;
 	glTexImage2D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, (GLint) p7, buffer_ptr);
 }
 
@@ -2505,7 +2505,7 @@
  */
 static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6, jobject buffer, jint offset)
 {
-	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer, offset);
+	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer) + offset;
 	glTexImage1D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, buffer_ptr);
 }
 

Index: extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- extgl.h	9 Feb 2005 10:37:29 -0000	1.47
+++ extgl.h	9 Feb 2005 10:57:30 -0000	1.48
@@ -123,6 +123,18 @@
 typedef double GLclampd;
 typedef void GLvoid;
 
+// OpenGL 2.0 types
+typedef int GLintptr;
+typedef unsigned int GLsizeiptr;
+typedef unsigned char GLchar;
+
+// ARB_shader_objects types
+typedef unsigned int GLhandleARB;
+// ARB_vertex_buffer_object types
+typedef int GLintptrARB;
+typedef unsigned int GLsizeiptrARB;
+typedef unsigned char GLcharARB;
+
 #define GL_VERSION                                              0x1F02
 #define GL_EXTENSIONS                                           0x1F03
 

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- common_tools.h	20 Jan 2005 21:30:31 -0000	1.35
+++ common_tools.h	9 Feb 2005 10:57:30 -0000	1.36
@@ -69,12 +69,12 @@
 #define inline __inline
 #endif
 
-static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer, int offset) {
+static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer) {
 	if (buffer != NULL) {
 #ifdef __cplusplus
-		return (void *)((char *)env->GetDirectBufferAddress(buffer) + offset);
+		return (void *)((char *)env->GetDirectBufferAddress(buffer));
 #else
-		return (void *)((char *)(*env)->GetDirectBufferAddress(env, buffer) + offset);
+		return (void *)((char *)(*env)->GetDirectBufferAddress(env, buffer));
 #endif
 	} else
 		return NULL;

Index: org_lwjgl_opengl_GL20.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL20.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_GL20.c	15 Jan 2005 23:50:55 -0000	1.3
+++ org_lwjgl_opengl_GL20.c	9 Feb 2005 10:57:30 -0000	1.4
@@ -38,11 +38,6 @@
 #include "extgl.h"
 #include "common_tools.h"
 
-typedef int GLintptr;
-typedef unsigned int GLsizeiptr;
-
-typedef unsigned char GLchar;
-
 // ARB_shader_objects
 typedef void (APIENTRY * glAttachShaderPROC) (GLuint program, GLuint shader);
 typedef void (APIENTRY * glCompileShaderPROC) (GLuint shader);

Index: org_lwjgl_opengl_GL12.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL12.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_GL12.c	13 Jan 2005 02:16:46 -0000	1.4
+++ org_lwjgl_opengl_GL12.c	9 Feb 2005 10:57:30 -0000	1.5
@@ -85,7 +85,7 @@
 static void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D
   (JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint format, jint type, jobject buffer, jint offset)
 {
-	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer, offset);
+	GLvoid *buffer_ptr = (GLvoid *)safeGetBufferAddress(env, buffer) + offset;
 	glTexImage3D(target, level, internalformat, width, height, depth, border, format, type, buffer_ptr);
 }
 

Index: org_lwjgl_opengl_GL15.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL15.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_GL15.c	10 Sep 2004 08:13:49 -0000	1.1
+++ org_lwjgl_opengl_GL15.c	9 Feb 2005 10:57:30 -0000	1.2
@@ -37,9 +37,6 @@
 #include "extgl.h"
 #include "common_tools.h"
 
-typedef int GLintptr;
-typedef unsigned int GLsizeiptr;
-
 typedef void (APIENTRY * glBindBufferPROC) (GLenum target, GLuint buffer);
 typedef void (APIENTRY * glDeleteBuffersPROC) (GLsizei n, const GLuint *buffers);
 typedef void (APIENTRY * glGenBuffersPROC) (GLsizei n, GLuint *buffers);
@@ -136,7 +133,7 @@
 static void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData
 	(JNIEnv * env, jclass clazz, jint target, jint size, jobject data, jint data_offset, jint usage)
 {
-	GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset);
+	GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data) + data_offset;
 	glBufferData(target, size, data_ptr, usage);
 	
 }

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

Modified Files:
	org_lwjgl_opengl_ARBBufferObject.c 
	org_lwjgl_opengl_ARBShaderObjects.c 
Log Message:
Moved extension type definitions into extgl.h. Removed offset argument to safeGetBufferAddress

Index: org_lwjgl_opengl_ARBShaderObjects.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_ARBShaderObjects.c	29 Oct 2004 19:48:12 -0000	1.2
+++ org_lwjgl_opengl_ARBShaderObjects.c	9 Feb 2005 10:57:31 -0000	1.3
@@ -37,9 +37,6 @@
 #include <stdlib.h>
 #include "extgl.h"
 
-typedef unsigned char GLcharARB;
-typedef unsigned int GLhandleARB;
-
 typedef void (APIENTRY * glDeleteObjectARBPROC) (GLhandleARB obj);
 typedef GLhandleARB (APIENTRY * glGetHandleARBPROC) (GLenum pname);
 typedef void (APIENTRY * glDetachObjectARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);

Index: org_lwjgl_opengl_ARBBufferObject.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_ARBBufferObject.c	10 Sep 2004 08:13:51 -0000	1.1
+++ org_lwjgl_opengl_ARBBufferObject.c	9 Feb 2005 10:57:31 -0000	1.2
@@ -37,9 +37,6 @@
 #include "extgl.h"
 #include "common_tools.h"
 
-typedef int GLintptrARB;
-typedef unsigned int GLsizeiptrARB;
-
 typedef void (APIENTRY * glBindBufferARBPROC) (GLenum target, GLuint buffer);
 typedef void (APIENTRY * glDeleteBuffersARBPROC) (GLsizei n, const GLuint *buffers);
 typedef void (APIENTRY * glGenBuffersARBPROC) (GLsizei n, GLuint *buffers);
@@ -117,7 +114,7 @@
 static void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferDataARB
 	(JNIEnv * env, jclass clazz, jint target, jint size, jobject data, jint data_offset, jint usage)
 {
-	GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset);
+	GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data) + data_offset;
 	glBufferDataARB(target, size, data_ptr, usage);
 	
 }
@@ -155,7 +152,7 @@
 {
 	void *buffer_address = glMapBufferARB((GLenum)target, (GLenum)access);
 	
-	void *old_buffer_address = safeGetBufferAddress(env, oldBuffer, 0);
+	void *old_buffer_address = safeGetBufferAddress(env, oldBuffer);
 	if (old_buffer_address == buffer_address)
 		return oldBuffer;
 	else

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

Modified Files:
	extgl.c extgl.h 
Log Message:
Mac OSX: removed agl

Index: extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- extgl.h	8 Feb 2005 19:20:56 -0000	1.46
+++ extgl.h	9 Feb 2005 10:37:29 -0000	1.47
@@ -123,277 +123,6 @@
 typedef double GLclampd;
 typedef void GLvoid;
 
-#ifdef _MACOSX
-#include <Carbon/Carbon.h>
-#include <OpenGL/gliContext.h>
-#include <OpenGL/gliDispatch.h>
-#include <AGL/aglContext.h>
-
-typedef struct __MACOSXRendererInfoRec  *AGLRendererInfo;
-typedef struct __MACOSXPixelFormatRec   *AGLPixelFormat;
-typedef struct __MACOSXContextRec       *AGLContext;
-
-typedef GDHandle AGLDevice;
-typedef CGrafPtr AGLDrawable;
-
-/*OSStatus aglInitEntryPoints(void);
-void aglDellocEntryPoints (void);
-void * aglGetProcAddress (char * pszProc);
-*/
-typedef AGLPixelFormat (APIENTRY * aglChoosePixelFormatPROC)(const AGLDevice *gdevs, GLint ndev, const GLint *attribs);
-typedef void (APIENTRY * aglDestroyPixelFormatPROC)(AGLPixelFormat pix);
-typedef AGLPixelFormat (APIENTRY * aglNextPixelFormatPROC)(AGLPixelFormat pix);
-typedef GLboolean (APIENTRY * aglDescribePixelFormatPROC)(AGLPixelFormat pix, GLint attrib, GLint *value);
-typedef AGLDevice * (APIENTRY * aglDevicesOfPixelFormatPROC)(AGLPixelFormat pix, GLint *ndevs);
-typedef AGLRendererInfo (APIENTRY * aglQueryRendererInfoPROC)(const AGLDevice *gdevs, GLint ndev);
-typedef void (APIENTRY * aglDestroyRendererInfoPROC)(AGLRendererInfo rend);
-typedef AGLRendererInfo (APIENTRY * aglNextRendererInfoPROC)(AGLRendererInfo rend);
-typedef GLboolean (APIENTRY * aglDescribeRendererPROC)(AGLRendererInfo rend, GLint prop, GLint *value);
-typedef AGLContext (APIENTRY * aglCreateContextPROC)(AGLPixelFormat pix, AGLContext share);
-typedef GLboolean (APIENTRY * aglDestroyContextPROC)(AGLContext ctx);
-typedef GLboolean (APIENTRY * aglCopyContextPROC)(AGLContext src, AGLContext dst, GLuint mask);
-typedef GLboolean (APIENTRY * aglUpdateContextPROC)(AGLContext ctx);
-typedef GLboolean (APIENTRY * aglSetCurrentContextPROC)(AGLContext ctx);
-typedef AGLContext (APIENTRY * aglGetCurrentContextPROC)(void);
-typedef GLboolean (APIENTRY * aglSetDrawablePROC)(AGLContext ctx, AGLDrawable draw);
-typedef GLboolean (APIENTRY * aglSetOffScreenPROC)(AGLContext ctx, GLsizei width, GLsizei height, GLsizei rowbytes, GLvoid *baseaddr);
-typedef GLboolean (APIENTRY * aglSetFullScreenPROC)(AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device);
-typedef AGLDrawable (APIENTRY * aglGetDrawablePROC)(AGLContext ctx);
-typedef GLboolean (APIENTRY * aglSetVirtualScreenPROC)(AGLContext ctx, GLint screen);
-typedef GLint (APIENTRY * aglGetVirtualScreenPROC)(AGLContext ctx);
-typedef void (APIENTRY * aglGetVersionPROC)(GLint *major, GLint *minor);
-typedef void (APIENTRY * aglSwapBuffersPROC)(AGLContext ctx);
-typedef GLboolean (APIENTRY * aglEnablePROC)(AGLContext ctx, GLenum pname);
-typedef GLboolean (APIENTRY * aglDisablePROC)(AGLContext ctx, GLenum pname);
-typedef GLboolean (APIENTRY * aglIsEnabledPROC)(AGLContext ctx, GLenum pname);
-typedef GLboolean (APIENTRY * aglSetIntegerPROC)(AGLContext ctx, GLenum pname, const GLint *params);
-typedef GLboolean (APIENTRY * aglGetIntegerPROC)(AGLContext ctx, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRY * aglUseFontPROC)(AGLContext ctx, GLint fontID, Style face, GLint size, GLint first, GLint count, GLint base);
-typedef GLenum (APIENTRY * aglGetErrorPROC)(void);
-typedef const GLubyte * (APIENTRY * aglErrorStringPROC)(GLenum code);
-typedef void (APIENTRY * aglResetLibraryPROC)(void);
-typedef void (APIENTRY * aglSurfaceTexturePROC) (AGLContext context, GLenum target, GLenum internalformat, AGLContext surfacecontext);
-
-extern aglChoosePixelFormatPROC aglChoosePixelFormat;
-extern aglDestroyPixelFormatPROC aglDestroyPixelFormat;
-extern aglNextPixelFormatPROC aglNextPixelFormat;
-extern aglDescribePixelFormatPROC aglDescribePixelFormat;
-extern aglDevicesOfPixelFormatPROC aglDevicesOfPixelFormat;
-extern aglQueryRendererInfoPROC aglQueryRendererInfo;
-extern aglDestroyRendererInfoPROC aglDestroyRendererInfo;
-extern aglNextRendererInfoPROC aglNextRendererInfo;
-extern aglDescribeRendererPROC aglDescribeRenderer;
-extern aglCreateContextPROC aglCreateContext;
-extern aglDestroyContextPROC aglDestroyContext;
-extern aglCopyContextPROC aglCopyContext;
-extern aglUpdateContextPROC aglUpdateContext;
-extern aglSetCurrentContextPROC aglSetCurrentContext;
-extern aglGetCurrentContextPROC aglGetCurrentContext;
-extern aglSetDrawablePROC aglSetDrawable;
-extern aglSetOffScreenPROC aglSetOffScreen;
-extern aglSetFullScreenPROC aglSetFullScreen;
-extern aglGetDrawablePROC aglGetDrawable;
-extern aglSetVirtualScreenPROC aglSetVirtualScreen;
-extern aglGetVirtualScreenPROC aglGetVirtualScreen;
-extern aglGetVersionPROC aglGetVersion;
-extern aglSwapBuffersPROC aglSwapBuffers;
-extern aglEnablePROC aglEnable;
-extern aglDisablePROC aglDisable;
-extern aglIsEnabledPROC aglIsEnabled;
-extern aglSetIntegerPROC aglSetInteger;
-extern aglGetIntegerPROC aglGetInteger;
-extern aglUseFontPROC aglUseFont;
-extern aglGetErrorPROC aglGetError;
-extern aglErrorStringPROC aglErrorString;
-extern aglResetLibraryPROC aglResetLibrary;
-extern aglSurfaceTexturePROC aglSurfaceTexture;
-
-
-/************************************************************************/
-
-/*
- ** Attribute names for aglChoosePixelFormat and aglDescribePixelFormat.
- */
-#define AGL_NONE                   0
-#define AGL_ALL_RENDERERS          1  /* choose from all available renderers          */
-#define AGL_BUFFER_SIZE            2  /* depth of the index buffer                    */
-#define AGL_LEVEL                  3  /* level in plane stacking                      */
-#define AGL_RGBA                   4  /* choose an RGBA format                        */
-#define AGL_DOUBLEBUFFER           5  /* double buffering supported                   */
-#define AGL_STEREO                 6  /* stereo buffering supported                   */
-#define AGL_AUX_BUFFERS            7  /* number of aux buffers                        */
-#define AGL_RED_SIZE               8  /* number of red component bits                 */
-#define AGL_GREEN_SIZE             9  /* number of green component bits               */
-#define AGL_BLUE_SIZE             10  /* number of blue component bits                */
-#define AGL_ALPHA_SIZE            11  /* number of alpha component bits               */
-#define AGL_DEPTH_SIZE            12  /* number of depth bits                         */
-#define AGL_STENCIL_SIZE          13  /* number of stencil bits                       */
-#define AGL_ACCUM_RED_SIZE        14  /* number of red accum bits                     */
-#define AGL_ACCUM_GREEN_SIZE      15  /* number of green accum bits                   */
-#define AGL_ACCUM_BLUE_SIZE       16  /* number of blue accum bits                    */
-#define AGL_ACCUM_ALPHA_SIZE      17  /* number of alpha accum bits                   */
-
-/*
- ** Extended attributes
- */
-#define AGL_PIXEL_SIZE            50  /* frame buffer bits per pixel                  */
-#define AGL_MINIMUM_POLICY        51  /* never choose smaller buffers than requested  */
-#define AGL_MAXIMUM_POLICY        52  /* choose largest buffers of type requested     */
-#define AGL_OFFSCREEN             53  /* choose an off-screen capable renderer        */
-#define AGL_FULLSCREEN            54  /* choose a full-screen capable renderer        */
-#define AGL_SAMPLE_BUFFERS_ARB    55  /* number of multi sample buffers               */
-#define AGL_SAMPLES_ARB	          56  /* number of samples per multi sample buffer    */
-#define AGL_AUX_DEPTH_STENCIL	  57  /* independent depth and/or stencil buffers for the aux buffer */
-
-/* Renderer management */
-#define AGL_RENDERER_ID           70  /* request renderer by ID                       */
-#define AGL_SINGLE_RENDERER       71  /* choose a single renderer for all screens     */
-#define AGL_NO_RECOVERY           72  /* disable all failure recovery systems         */
-#define AGL_ACCELERATED           73  /* choose a hardware accelerated renderer       */
-#define AGL_CLOSEST_POLICY        74  /* choose the closest color buffer to request   */
-#define AGL_ROBUST                75  /* renderer does not need failure recovery      */
-#define AGL_BACKING_STORE         76  /* back buffer contents are valid after swap    */
-#define AGL_MP_SAFE               78  /* renderer is multi-processor safe             */
-
-/*
- ** Only for aglDescribePixelFormat
- */
-#define AGL_WINDOW                80  /* can be used to render to an onscreen window  */
-#define AGL_MULTISCREEN           81  /* single window can span multiple screens      */
-#define AGL_VIRTUAL_SCREEN        82  /* virtual screen number                        */
-#define AGL_COMPLIANT             83  /* renderer is opengl compliant                 */
-
-/*
- ** Property names for aglDescribeRenderer
- */
-/* #define AGL_OFFSCREEN          53 */
-/* #define AGL_FULLSCREEN         54 */
-/* #define AGL_RENDERER_ID        70 */
-/* #define AGL_ACCELERATED        73 */
-/* #define AGL_ROBUST             75 */
-/* #define AGL_BACKING_STORE      76 */
-/* #define AGL_MP_SAFE            78 */
-/* #define AGL_WINDOW             80 */
-/* #define AGL_MULTISCREEN        81 */
-/* #define AGL_COMPLIANT          83 */
-#define AGL_BUFFER_MODES         100
-#define AGL_MIN_LEVEL            101
-#define AGL_MAX_LEVEL            102
-#define AGL_COLOR_MODES          103
-#define AGL_ACCUM_MODES          104
-#define AGL_DEPTH_MODES          105
-#define AGL_STENCIL_MODES        106
-#define AGL_MAX_AUX_BUFFERS      107
-#define AGL_VIDEO_MEMORY         120
-#define AGL_TEXTURE_MEMORY       121
-
-/*
- ** Integer parameter names
- */
-#define AGL_SWAP_RECT	         200  /* Enable or set the swap rectangle              */
-#define AGL_BUFFER_RECT          202  /* Enable or set the buffer rectangle            */
-#define AGL_SWAP_LIMIT           203  /* Enable or disable the swap async limit        */
-#define AGL_COLORMAP_TRACKING    210  /* Enable or disable colormap tracking           */
-#define AGL_COLORMAP_ENTRY       212  /* Set a colormap entry to {index, r, g, b}      */
-#define AGL_RASTERIZATION        220  /* Enable or disable all rasterization           */
-#define AGL_SWAP_INTERVAL        222  /* 0 -> Don't sync, n -> Sync every n retrace    */
-#define AGL_STATE_VALIDATION     230  /* Validate state for multi-screen functionality */
-#define AGL_BUFFER_NAME          231  /* Set the buffer name. Allows for multi ctx to share a buffer */
-#define AGL_ORDER_CONTEXT_TO_FRONT  232  /* Order the current context in front of all the other contexts. */
-#define AGL_CONTEXT_SURFACE_ID   233  /* aglGetInteger only - returns the ID of the drawable surface for the context */
-#define AGL_CONTEXT_DISPLAY_ID   234  /* aglGetInteger only - returns the display ID(s) of all displays touched by the context, up to a maximum of 32 displays */
-#define AGL_SURFACE_ORDER        235  /* Position of OpenGL surface relative to window: 1 -> Above window, -1 -> Below Window */
-#define AGL_SURFACE_OPACITY      236  /* Opacity of OpenGL surface: 1 -> Surface is opaque (default), 0 -> non-opaque */
-#define AGL_CLIP_REGION          254  /* Enable or set the drawable clipping region */
-#define AGL_FS_CAPTURE_SINGLE    255  /* Enable the capture of only a single display for aglFullScreen, normally disabled */
-
-/*
- ** Option names for aglConfigure.
- */
-#define AGL_FORMAT_CACHE_SIZE    501  /* Set the size of the pixel format cache        */
-#define AGL_CLEAR_FORMAT_CACHE   502  /* Reset the pixel format cache                  */
-#define AGL_RETAIN_RENDERERS     503  /* Whether to retain loaded renderers in memory  */
-
-/* buffer_modes */
-#define AGL_MONOSCOPIC_BIT       0x00000001
-#define AGL_STEREOSCOPIC_BIT     0x00000002
-#define AGL_SINGLEBUFFER_BIT     0x00000004
-#define AGL_DOUBLEBUFFER_BIT     0x00000008
-
-/* bit depths */
-#define AGL_0_BIT                0x00000001
-#define AGL_1_BIT                0x00000002
-#define AGL_2_BIT                0x00000004
-#define AGL_3_BIT                0x00000008
-#define AGL_4_BIT                0x00000010
-#define AGL_5_BIT                0x00000020
-#define AGL_6_BIT                0x00000040
-#define AGL_8_BIT                0x00000080
-#define AGL_10_BIT               0x00000100
-#define AGL_12_BIT               0x00000200
-#define AGL_16_BIT               0x00000400
-#define AGL_24_BIT               0x00000800
-#define AGL_32_BIT               0x00001000
-#define AGL_48_BIT               0x00002000
-#define AGL_64_BIT               0x00004000
-#define AGL_96_BIT               0x00008000
-#define AGL_128_BIT              0x00010000
-
-/* color modes */
-#define AGL_RGB8_BIT             0x00000001  /* 8 rgb bit/pixel,     RGB=7:0, inverse colormap         */
-#define AGL_RGB8_A8_BIT          0x00000002  /* 8-8 argb bit/pixel,  A=7:0, RGB=7:0, inverse colormap  */
-#define AGL_BGR233_BIT           0x00000004  /* 8 rgb bit/pixel,     B=7:6, G=5:3, R=2:0               */
-#define AGL_BGR233_A8_BIT        0x00000008  /* 8-8 argb bit/pixel,  A=7:0, B=7:6, G=5:3, R=2:0        */
-#define AGL_RGB332_BIT           0x00000010  /* 8 rgb bit/pixel,     R=7:5, G=4:2, B=1:0               */
-#define AGL_RGB332_A8_BIT        0x00000020  /* 8-8 argb bit/pixel,  A=7:0, R=7:5, G=4:2, B=1:0        */
-#define AGL_RGB444_BIT           0x00000040  /* 16 rgb bit/pixel,    R=11:8, G=7:4, B=3:0              */
-#define AGL_ARGB4444_BIT         0x00000080  /* 16 argb bit/pixel,   A=15:12, R=11:8, G=7:4, B=3:0     */
-#define AGL_RGB444_A8_BIT        0x00000100  /* 8-16 argb bit/pixel, A=7:0, R=11:8, G=7:4, B=3:0       */
-#define AGL_RGB555_BIT           0x00000200  /* 16 rgb bit/pixel,    R=14:10, G=9:5, B=4:0             */
-#define AGL_ARGB1555_BIT         0x00000400  /* 16 argb bit/pixel,   A=15, R=14:10, G=9:5, B=4:0       */
-#define AGL_RGB555_A8_BIT        0x00000800  /* 8-16 argb bit/pixel, A=7:0, R=14:10, G=9:5, B=4:0      */
-#define AGL_RGB565_BIT           0x00001000  /* 16 rgb bit/pixel,    R=15:11, G=10:5, B=4:0            */
-#define AGL_RGB565_A8_BIT        0x00002000  /* 8-16 argb bit/pixel, A=7:0, R=15:11, G=10:5, B=4:0     */
-#define AGL_RGB888_BIT           0x00004000  /* 32 rgb bit/pixel,    R=23:16, G=15:8, B=7:0            */
-#define AGL_ARGB8888_BIT         0x00008000  /* 32 argb bit/pixel,   A=31:24, R=23:16, G=15:8, B=7:0   */
-#define AGL_RGB888_A8_BIT        0x00010000  /* 8-32 argb bit/pixel, A=7:0, R=23:16, G=15:8, B=7:0     */
-#define AGL_RGB101010_BIT        0x00020000  /* 32 rgb bit/pixel,    R=29:20, G=19:10, B=9:0           */
-#define AGL_ARGB2101010_BIT      0x00040000  /* 32 argb bit/pixel,   A=31:30  R=29:20, G=19:10, B=9:0  */
-#define AGL_RGB101010_A8_BIT     0x00080000  /* 8-32 argb bit/pixel, A=7:0  R=29:20, G=19:10, B=9:0    */
-#define AGL_RGB121212_BIT        0x00100000  /* 48 rgb bit/pixel,    R=35:24, G=23:12, B=11:0          */
-#define AGL_ARGB12121212_BIT     0x00200000  /* 48 argb bit/pixel,   A=47:36, R=35:24, G=23:12, B=11:0 */
-#define AGL_RGB161616_BIT        0x00400000  /* 64 rgb bit/pixel,    R=47:32, G=31:16, B=15:0          */
-#define AGL_ARGB16161616_BIT     0x00800000  /* 64 argb bit/pixel,   A=63:48, R=47:32, G=31:16, B=15:0 */
-#define AGL_INDEX8_BIT           0x20000000  /* 8 bit color look up table                              */
-#define AGL_INDEX16_BIT          0x40000000  /* 16 bit color look up table                             */
-
-/*
- ** Error return values from aglGetError.
- */
-#define AGL_NO_ERROR                 0 /* no error                        */
-
-#define AGL_BAD_ATTRIBUTE        10000 /* invalid pixel format attribute  */
-#define AGL_BAD_PROPERTY         10001 /* invalid renderer property       */
-#define AGL_BAD_PIXELFMT         10002 /* invalid pixel format            */
-#define AGL_BAD_RENDINFO         10003 /* invalid renderer info           */
-#define AGL_BAD_CONTEXT          10004 /* invalid context                 */
-#define AGL_BAD_DRAWABLE         10005 /* invalid drawable                */
-#define AGL_BAD_GDEV             10006 /* invalid graphics device         */
-#define AGL_BAD_STATE            10007 /* invalid context state           */
-#define AGL_BAD_VALUE            10008 /* invalid numerical value         */
-#define AGL_BAD_MATCH            10009 /* invalid share context           */
-#define AGL_BAD_ENUM             10010 /* invalid enumerant               */
-#define AGL_BAD_OFFSCREEN        10011 /* invalid offscreen drawable      */
-#define AGL_BAD_FULLSCREEN       10012 /* invalid offscreen drawable      */
-#define AGL_BAD_WINDOW           10013 /* invalid window                  */
-#define AGL_BAD_POINTER          10014 /* invalid pointer                 */
-#define AGL_BAD_MODULE           10015 /* invalid code module             */
-#define AGL_BAD_ALLOC            10016 /* memory allocation failure       */
-
-/************************************************************************/
-
-#endif /* _MACOSX */
-
 #define GL_VERSION                                              0x1F02
 #define GL_EXTENSIONS                                           0x1F03
 

Index: extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- extgl.c	13 Dec 2004 11:11:28 -0000	1.30
+++ extgl.c	9 Feb 2005 10:37:28 -0000	1.31
@@ -49,42 +49,6 @@
 #include <dlfcn.h>
 #endif
 
-#ifdef _MACOSX
-aglChoosePixelFormatPROC aglChoosePixelFormat = NULL;
-aglDestroyPixelFormatPROC aglDestroyPixelFormat = NULL;
-aglNextPixelFormatPROC aglNextPixelFormat = NULL;
-aglDescribePixelFormatPROC aglDescribePixelFormat = NULL;
-aglDevicesOfPixelFormatPROC aglDevicesOfPixelFormat = NULL;
-aglQueryRendererInfoPROC aglQueryRendererInfo = NULL;
-aglDestroyRendererInfoPROC aglDestroyRendererInfo = NULL;
-aglNextRendererInfoPROC aglNextRendererInfo = NULL;
-aglDescribeRendererPROC aglDescribeRenderer = NULL;
-aglCreateContextPROC aglCreateContext = NULL;
-aglDestroyContextPROC aglDestroyContext = NULL;
-aglCopyContextPROC aglCopyContext = NULL;
-aglUpdateContextPROC aglUpdateContext = NULL;
-aglSetCurrentContextPROC aglSetCurrentContext = NULL;
-aglGetCurrentContextPROC aglGetCurrentContext = NULL;
-aglSetDrawablePROC aglSetDrawable = NULL;
-aglSetOffScreenPROC aglSetOffScreen = NULL;
-aglSetFullScreenPROC aglSetFullScreen = NULL;
-aglGetDrawablePROC aglGetDrawable = NULL;
-aglSetVirtualScreenPROC aglSetVirtualScreen = NULL;
-aglGetVirtualScreenPROC aglGetVirtualScreen = NULL;
-aglGetVersionPROC aglGetVersion = NULL;
-aglSwapBuffersPROC aglSwapBuffers = NULL;
-aglEnablePROC aglEnable = NULL;
-aglDisablePROC aglDisable = NULL;
-aglIsEnabledPROC aglIsEnabled = NULL;
-aglSetIntegerPROC aglSetInteger = NULL;
-aglGetIntegerPROC aglGetInteger = NULL;
-aglUseFontPROC aglUseFont = NULL;
-aglGetErrorPROC aglGetError = NULL;
-aglErrorStringPROC aglErrorString = NULL;
-aglResetLibraryPROC aglResetLibrary = NULL;
-aglSurfaceTexturePROC aglSurfaceTexture = NULL;
-#endif
-
 #ifndef _MACOSX
 struct ExtensionTypes extgl_Extensions;
 #endif

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

Modified Files:
	org_lwjgl_opengl_Pbuffer.m 
Log Message:
Mac OSX: removed agl

Index: org_lwjgl_opengl_Pbuffer.m
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Pbuffer.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_Pbuffer.m	29 Jan 2005 18:20:41 -0000	1.4
+++ org_lwjgl_opengl_Pbuffer.m	9 Feb 2005 10:37:31 -0000	1.5
@@ -41,6 +41,7 @@
 
 #import <jni.h>
 #import <OpenGL/gl.h>
+#import <OpenGL/glext.h>
 #import "org_lwjgl_opengl_MacOSXDisplay.h"
 #import "org_lwjgl_opengl_Pbuffer.h"
 #import "display.h"