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

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

Modified Files:
	common_tools.h org_lwjgl_opengl_CoreGL11.cpp 
	org_lwjgl_opengl_CoreGL12.cpp org_lwjgl_opengl_CoreGL14.cpp 
	org_lwjgl_opengl_GL.cpp 
Log Message:
Moved utility functions to common_tools in preparation of extension separation

Index: common_tools.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- common_tools.h	20 Dec 2003 22:03:24 -0000	1.6
+++ common_tools.h	5 Jan 2004 22:43:42 -0000	1.7
@@ -67,4 +67,22 @@
 extern void setDebugEnabled(bool enable);
 extern void printfDebug(const char *format, ...);
 
+static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer) {
+	if (buffer == NULL)
+		return NULL;
+	else
+		return env->GetDirectBufferAddress(buffer);
+}
+
+static inline jobject safeNewBuffer(JNIEnv *env, void *p, int size) {
+	if (p == NULL)
+		return NULL;
+	else
+		return env->NewDirectByteBuffer(p, size);
+}
+
+static inline const void *offsetToPointer(jint offset) {
+	return (const char *)NULL + offset;
+}
+
 #endif

Index: org_lwjgl_opengl_CoreGL11.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL11.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_opengl_CoreGL11.cpp	4 Aug 2003 23:00:49 -0000	1.7
+++ org_lwjgl_opengl_CoreGL11.cpp	5 Jan 2004 22:43:42 -0000	1.8
@@ -47,17 +47,6 @@
 #include "checkGLerror.h"
 #include "extgl.h"
 
-static inline jobject newBuffer(JNIEnv *env, void *p, int size) {
-	if (p == NULL)
-		return NULL;
-	else
-		return env->NewDirectByteBuffer(p, size);
-}
-
-static inline const void *offsetToPointer(jint offset) {
-	return (const char *)NULL + offset;
-}
-
 /*
  * Class:     org_lwjgl_opengl_CoreGL11
  * Method:    glAccum
@@ -906,7 +895,7 @@
 	void *pointer;
 	glGetPointerv((GLint) p0, &pointer);
 	CHECK_GL_ERROR
-	return newBuffer(env, pointer, size);
+	return safeNewBuffer(env, pointer, size);
 }
 
 /*

Index: org_lwjgl_opengl_CoreGL12.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL12.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL12.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_CoreGL12.cpp	4 Aug 2003 23:00:49 -0000	1.3
+++ org_lwjgl_opengl_CoreGL12.cpp	5 Jan 2004 22:43:42 -0000	1.4
@@ -47,10 +47,6 @@
 #include "checkGLerror.h"
 #include "extgl.h"
 
-static inline const void *offsetToPointer(jint offset) {
-	return (const char *)NULL + offset;
-}
-
 /*
  * Class:     org_lwjgl_opengl_CoreGL12
  * Method:    glColorTable

Index: org_lwjgl_opengl_CoreGL14.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL14.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL14.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_CoreGL14.cpp	4 Aug 2003 23:00:49 -0000	1.3
+++ org_lwjgl_opengl_CoreGL14.cpp	5 Jan 2004 22:43:42 -0000	1.4
@@ -47,10 +47,6 @@
 #include "checkGLerror.h"
 #include "extgl.h"
 
-static inline const void *offsetToPointer(jint offset) {
-        return (const char *)NULL + offset;
-}
-
 /*
  * Class:     org_lwjgl_opengl_CoreGL14
  * Method:    glFogCoordf

Index: org_lwjgl_opengl_GL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_opengl_GL.cpp	23 Oct 2003 08:42:54 -0000	1.21
+++ org_lwjgl_opengl_GL.cpp	5 Jan 2004 22:43:42 -0000	1.22
@@ -51,24 +51,6 @@
 extern HDC hdc;
 #endif
 
-static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer) {
-	if (buffer == NULL)
-		return NULL;
-	else
-		return env->GetDirectBufferAddress(buffer);
-}
-
-static inline jobject safeNewBuffer(JNIEnv *env, void *p, int size) {
-	if (p == NULL)
-		return NULL;
-	else
-		return env->NewDirectByteBuffer(p, size);
-}
-
-static inline const void *offsetToPointer(jint offset) {
-        return (const char *)NULL + offset;
-}
-
 /*
  * Class:     org_lwjgl_opengl_GL
  * Method:    glActiveStencilFaceEXT

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

Modified Files:
	extgl.cpp 
Log Message:


Index: extgl.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- extgl.cpp	3 Jan 2004 08:09:17 -0000	1.9
+++ extgl.cpp	5 Jan 2004 13:21:41 -0000	1.10
@@ -3080,7 +3080,7 @@
 
 static void extgl_InitGLUSupportedExtensions(JNIEnv *env, jobject ext_set)
 {
-	char *s = (char*) gluGetString(GLU_VERSION);
+	const char *s = (const char *)gluGetString(GLU_VERSION);
 	if (!s)
 		return;
 	s = strstr(s, "1.");