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

Revision: 2344
Author:   elias_naur
Date:     2006-05-29 12:03:02 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2344&view=rev

Log Message:
-----------
Linux: Added Xfixes to the list of libraries liblwjgl.so statically links to

Modified Paths:
--------------
    trunk/LWJGL/src/native/linux/Makefile
    trunk/LWJGL/src/native/linux/Makefile.amd64
Modified: trunk/LWJGL/src/native/linux/Makefile
===================================================================
--- trunk/LWJGL/src/native/linux/Makefile	2006-05-29 12:30:23 UTC (rev 2343)
+++ trunk/LWJGL/src/native/linux/Makefile	2006-05-29 19:03:02 UTC (rev 2344)
@@ -4,7 +4,7 @@
 LINKER=gcc
 STRIP=strip
 CFLAGS_LINK=-Wl,--version-script=lwjgl.map -O2 -shared -Wall
-LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
+LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared
 CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
 SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
 OBJECTS=$(subst .c,.o,$(SRC))

Modified: trunk/LWJGL/src/native/linux/Makefile.amd64
===================================================================
--- trunk/LWJGL/src/native/linux/Makefile.amd64	2006-05-29 12:30:23 UTC (rev 2343)
+++ trunk/LWJGL/src/native/linux/Makefile.amd64	2006-05-29 19:03:02 UTC (rev 2344)
@@ -4,7 +4,7 @@
 LINKER=gcc
 STRIP=strip
 CFLAGS_LINK=-fPIC -shared -Wall
-LIBS=-L/usr/X11R6/lib64 -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/amd64 -ljawt -lXxf86vm -Wl,-static,-lXcursor,-lXrender,-lXrandr,-call_shared
+LIBS=-L/usr/X11R6/lib64 -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/amd64 -ljawt -lXxf86vm -Wl,-static,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared
 CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
 SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
 OBJECTS=$(subst .c,.o,$(SRC))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2343
Author:   elias_naur
Date:     2006-05-29 05:30:23 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2343&view=rev

Log Message:
-----------
Split out the exception case in BufferChecks.checkBufferSize() to help the JVM inline it

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2006-05-29 12:24:46 UTC (rev 2342)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java	2006-05-29 12:30:23 UTC (rev 2343)
@@ -178,6 +178,13 @@
 	}
 
 	/**
+	 * This is a separate call to help inline checkBufferSize.
+	 */
+	private static void throwBufferSizeException(Buffer buf, int size) {
+		throw new IllegalArgumentException("Number of remaining buffer elements is " + buf.remaining() + ", must be at least " + size);
+	}
+			
+	/**
 	 * Helper method to ensure a buffer is big enough to receive data from a
 	 * glGet* operation.
 	 *
@@ -189,7 +196,7 @@
 	 */
 	private static void checkBufferSize(Buffer buf, int size) {
 		if (buf.remaining() < size) {
-			throw new IllegalArgumentException("Number of remaining buffer elements is " + buf.remaining() + ", must be at least " + size);
+			throwBufferSizeException(buf, size);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2342
Author:   elias_naur
Date:     2006-05-29 05:24:46 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2342&view=rev

Log Message:
-----------
Saved one getClientAttribStack() in StateTracker.pushAttrib()

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2006-05-26 12:58:37 UTC (rev 2341)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2006-05-29 12:24:46 UTC (rev 2342)
@@ -53,8 +53,9 @@
 	}
 	
 	static void pushAttrib(int mask) {
-		getClientAttribStack().pushState();
-		getClientAttribStack().setState(mask);
+		StateStack attrib_stack = getClientAttribStack();
+		attrib_stack.pushState();
+		attrib_stack.setState(mask);
 		if ((mask & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0) {
 			getReferencesStack().pushState();
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.