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

Revision: 2812
          http://svn.sourceforge.net/java-game-lib/?rev=2812&view=rev
Author:   elias_naur
Date:     2007-04-29 13:22:25 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
Re-implemented VBO buffer binding caches to speed up gl*Pointer calls. Patch by MatthiasM.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java

Added: trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java	2007-04-29 20:22:25 UTC (rev 2812)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.lwjgl.opengl;
+
+class BaseReferences {
+
+    int elementArrayBuffer;
+    int arrayBuffer;
+
+    void clear() {
+        this.elementArrayBuffer = 0;
+        this.arrayBuffer = 0;
+    }
+
+    void copy(BaseReferences references) {
+        this.elementArrayBuffer = references.elementArrayBuffer;
+        this.arrayBuffer = references.arrayBuffer;
+    }
+}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2007-04-29 19:38:04 UTC (rev 2811)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java	2007-04-29 20:22:25 UTC (rev 2812)
@@ -80,25 +80,25 @@
 	
 	/** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
 	static void ensureArrayVBOdisabled(ContextCapabilities caps) {
-		if ((caps.OpenGL15 || caps.GL_ARB_vertex_buffer_object) && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, false))
+		if(StateTracker.getReferencesStack(caps).getReferences().arrayBuffer != 0)
 			throw new OpenGLException("Cannot use Buffers when Array Buffer Object is enabled");
 	}
 
 	/** Helper method to ensure that array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
 	static void ensureArrayVBOenabled(ContextCapabilities caps) {
-		if ((caps.OpenGL15 || caps.GL_ARB_vertex_buffer_object) && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, true))
+		if(StateTracker.getReferencesStack(caps).getReferences().arrayBuffer == 0)
 			throw new OpenGLException("Cannot use offsets when Array Buffer Object is disabled");
 	}
 
 	/** Helper method to ensure that element array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
 	static void ensureElementVBOdisabled(ContextCapabilities caps) {
-		if ((caps.OpenGL15 || caps.GL_ARB_vertex_buffer_object) && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, false))
+		if(StateTracker.getReferencesStack(caps).getReferences().elementArrayBuffer != 0)
 			throw new OpenGLException("Cannot use Buffers when Element Array Buffer Object is enabled");
 	}
 
 	/** Helper method to ensure that element array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
 	static void ensureElementVBOenabled(ContextCapabilities caps) {
-		if ((caps.OpenGL15 || caps.GL_ARB_vertex_buffer_object) && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, true))
+		if(StateTracker.getReferencesStack(caps).getReferences().elementArrayBuffer == 0)
 			throw new OpenGLException("Cannot use offsets when Element Array Buffer Object is disabled");
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2007-04-29 19:38:04 UTC (rev 2811)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java	2007-04-29 20:22:25 UTC (rev 2812)
@@ -64,4 +64,16 @@
 	static ReferencesStack getReferencesStack(ContextCapabilities caps) {
 		return caps.tracker.references_stack;
 	}
+
+        static void bindBuffer(ContextCapabilities caps, int target, int buffer) {
+            ReferencesStack references_stack = getReferencesStack(caps);
+            switch(target) {
+                case GL15.GL_ELEMENT_ARRAY_BUFFER:
+                    references_stack.getReferences().elementArrayBuffer = buffer;
+                    break;
+                case GL15.GL_ARRAY_BUFFER:
+                    references_stack.getReferences().arrayBuffer = buffer;
+                    break;
+            }
+        }
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java	2007-04-29 19:38:04 UTC (rev 2811)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java	2007-04-29 20:22:25 UTC (rev 2812)
@@ -166,7 +166,7 @@
 			writer.println();
 			writer.println("package org.lwjgl.opengl;");
 			writer.println();
-			writer.println("class " + REFERENCES_CLASS_NAME + " {");
+			writer.println("class " + REFERENCES_CLASS_NAME + " extends BaseReferences {");
 			DeclarationFilter filter = DeclarationFilter.getFilter(InterfaceDeclaration.class);
 			Collection<TypeDeclaration> interface_decls = filter.filter(env.getSpecifiedTypeDeclarations());
 			for (TypeDeclaration typedecl : interface_decls) {
@@ -175,12 +175,14 @@
 			}
 			writer.println();
 			writer.println("\tvoid copy(" + REFERENCES_CLASS_NAME + " " + REFERENCES_PARAMETER_NAME + ") {");
+			writer.println("\t\tsuper.copy(" + REFERENCES_PARAMETER_NAME + ");");
 			for (TypeDeclaration typedecl : interface_decls) {
 				InterfaceDeclaration interface_decl = (InterfaceDeclaration)typedecl;
 				generateCopiesFromMethods(writer, interface_decl);
 			}
 			writer.println("\t}");
 			writer.println("\tvoid clear() {");
+			writer.println("\t\tsuper.clear();");
 			for (TypeDeclaration typedecl : interface_decls) {
 				InterfaceDeclaration interface_decl = (InterfaceDeclaration)typedecl;
 				generateClearsFromMethods(writer, interface_decl);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2007-04-29 19:38:04 UTC (rev 2811)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_buffer_object.java	2007-04-29 20:22:25 UTC (rev 2812)
@@ -67,6 +67,7 @@
 	int GL_BUFFER_MAPPED_ARB = 0x88BC;
 	int GL_BUFFER_MAP_POINTER_ARB = 0x88BD;
 
+	@Code("		StateTracker.bindBuffer(caps, target, buffer);")
 	void glBindBufferARB(@GLenum int target, @GLuint int buffer);
 
 	void glDeleteBuffersARB(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2007-04-29 19:38:04 UTC (rev 2811)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL15.java	2007-04-29 20:22:25 UTC (rev 2812)
@@ -72,6 +72,7 @@
 	int GL_BUFFER_MAPPED = 0x88BC;
 	int GL_BUFFER_MAP_POINTER = 0x88BD;
 
+	@Code("		StateTracker.bindBuffer(caps, target, buffer);")
 	void glBindBuffer(@GLenum int target, @GLuint int buffer);
 
 	void glDeleteBuffers(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers);


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

Revision: 2811
          http://svn.sourceforge.net/java-game-lib/?rev=2811&view=rev
Author:   elias_naur
Date:     2007-04-29 12:38:04 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
Removed Util.glGetInteger convenience method since it is not thread safe

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2007-04-29 11:06:40 UTC (rev 2810)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Util.java	2007-04-29 19:38:04 UTC (rev 2811)
@@ -43,9 +43,6 @@
  */
 
 public final class Util {
-
-	private static final IntBuffer int_buffer = BufferUtils.createIntBuffer(16);
-
 	/** No c'tor */
 	private Util() {
 	}
@@ -56,16 +53,4 @@
 			throw new OpenGLException(err);
 		}
 	}
-
-	/**
-	 * Obtain a GL integer value from the driver
-	 *
-	 * @param gl_enum The GL value you want
-	 *
-	 * @return the integer value
-	 */
-	public static int glGetInteger(int gl_enum) {
-		GL11.glGetInteger(gl_enum, int_buffer);
-		return int_buffer.get(0);
-	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java	2007-04-29 11:06:40 UTC (rev 2810)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/shaders/Shader.java	2007-04-29 19:38:04 UTC (rev 2811)
@@ -51,6 +51,7 @@
 
 abstract class Shader {
 
+	private static final IntBuffer int_buffer = BufferUtils.createIntBuffer(16);
 	protected static IntBuffer programBuffer = BufferUtils.createIntBuffer(1);
 	protected static ByteBuffer fileBuffer = BufferUtils.createByteBuffer(1024 * 10);
 
@@ -61,6 +62,18 @@
 
 	abstract void cleanup();
 
+	/**
+	 * Obtain a GL integer value from the driver
+	 *
+	 * @param gl_enum The GL value you want
+	 *
+	 * @return the integer value
+	 */
+	public static int glGetInteger(int gl_enum) {
+		GL11.glGetInteger(gl_enum, int_buffer);
+		return int_buffer.get(0);
+	}
+
 	protected static ByteBuffer getShaderText(String file) {
 		ByteBuffer shader = null;
 
@@ -99,7 +112,7 @@
 			final byte[] bytes = new byte[programSource.capacity()];
 			programSource.get(bytes);
 
-			final int errorPos = Util.glGetInteger(ARBProgram.GL_PROGRAM_ERROR_POSITION_ARB);
+			final int errorPos = glGetInteger(ARBProgram.GL_PROGRAM_ERROR_POSITION_ARB);
 			int lineStart = 0;
 			int lineEnd = -1;
 			for ( int i = 0; i < bytes.length; i++ ) {
@@ -185,4 +198,4 @@
 		System.out.println(new String(charArray, 0, logLength));
 	}
 
-}
\ No newline at end of file
+}


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

CDPN Moves To Corners GPS Market In China!

China Datacom Corp.
Sym: CDPN
Close: $0.065

CDPN announced Friday that is has acquired all outstanding shares of
General Link Information Systems, Chinas only GPS vehicle monitoring and
management system. GPS systems are huge; controlling that market is even
bigger. Read the news and get on CDPN first thing Monday!

com  Go back to listings
All candidates applying for this position should have 8 to 10 years of
experience in maintaining boiler systems on Naval ships or commercial
vessels of equivalent size and nature.
Relocation is provided.
Great opportunity, pay, benefits and good relocation package. Relocation
is available for the right candidate. Salary commensurate with
experience. Must be able to work with minimum supervision, meet
deadlines, and be a key contributor in a high level system engineering
group. Quality Program certification or Six Sigma Belt is a plus and
background with LMR or telecommunication is preferred. license, and a
minimum of 3 years experience is required.
Large, Mid-Atlantic, multi-facility healthcare organization in Eastern
VA has an immediate opening for a Project Manager to join their IT
staff. The ability to monitor performance against the project plan,
detect variations early and take a proactive approach to ensure timely
project completion and delivery are essential.
You should expect to work 5, 10 hour days.
Salary commensurate with experience.
comJob Description:thinkenergygroup.
Moderate travel is involved.
Requires knowledge of generally accepted accounting principles and
mathematical skills and proficiency with general computer operation and
Microsoft Office applications. The ideal candidate will have 2 to 5
years experience with motion control electronics and the ability to
support both electrical and mechanical products. What type products were
manufactured?
Detail your wireless, telecommunication, rf experience in a quality
engineering or quality position for a manufacturer or installer of large
scale technical products.
What version of Inventor are you currently using?
Excellent opportunity.
Equipment is used within municipal water and waste treatment plants.
Describe in detail your experience with maximizing revenue and
profitability while controlling the commercial and technical risk
exposure on Projects. Please highlight some of your projects and your
responsibilities. ) construction projects.
You need a BS degree in Engineering (Mechanical, Electrical or similar).
Do you have experience as a Civil Engineer project Manager? What were
your primary responsibilities?
When are you available?
Is this acceptable to you? Relocation assistance may be available for
the right candidate.
You will be responsible for managing and coordinating multiple, complex
project plans, including implementation schedules.
Engineering client has an IMMEDIATE NEED for 2 Sr. The ideal candidate
will have experience managing Environmental and Civil Engineering
projects. Client located in the state of Virginia has an immediate need
for a Project Manager with experience in land development,
municipalities, and institutions.
Describe your experience with trial preparation, and testimony in
construction claims. Our client will consider candidates that do not
have a degree but have significant field experience.
Describe your experience with trial preparation, and testimony in
construction claims. Describe in detail your experience with maximizing
revenue and profitability while controlling the commercial and technical
risk exposure on Projects. A MS in any of these areas is preferred. How
large (dollar value) were the projects that you managed the construction
on? For how long and where?
The candidate will participate in process improvement efforts to
maximize profits.
All candidates applying for this position should have 8 to 10 years of
experience in maintaining boiler systems on Naval ships or commercial
vessels of equivalent size and nature.
Please highlight any experience providing application assistance for
electrical, mechanical, and-or motion control systems.

Revision: 2809
          http://svn.sourceforge.net/java-game-lib/?rev=2809&view=rev
Author:   matzon
Date:     2007-04-29 04:05:43 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
updating lwjgl 1.1

Removed Paths:
-------------
    tags/lwjgl1.1/


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

Revision: 2810
          http://svn.sourceforge.net/java-game-lib/?rev=2810&view=rev
Author:   matzon
Date:     2007-04-29 04:06:40 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
updating lwjgl 1.1

Added Paths:
-----------
    tags/lwjgl1.1/

Copied: tags/lwjgl1.1 (from rev 2809, trunk)


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