Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3237] trunk/LWJGL/src
|
From: <sp...@us...> - 2009-09-08 15:07:29
|
Revision: 3237
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3237&view=rev
Author: spasi
Date: 2009-09-08 15:07:15 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
Added support for PIXEL_STORE state tracking.
Changed PBO GLChecks to use LWJGL's state tracking instead of using glGetInteger.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java
trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
trunk/LWJGL/src/java/org/lwjgl/opengl/ReferencesStack.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/GL11.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java 2009-09-08 12:27:59 UTC (rev 3236)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/BaseReferences.java 2009-09-08 15:07:15 UTC (rev 3237)
@@ -41,9 +41,12 @@
int arrayBuffer;
Buffer[] glVertexAttribPointer_buffer;
Buffer[] glTexCoordPointer_buffer;
- int glClientActiveTexture;
+ int glClientActiveTexture;
- BaseReferences(ContextCapabilities caps) {
+ int pixelPackBuffer;
+ int pixelUnpackBuffer;
+
+ BaseReferences(ContextCapabilities caps) {
IntBuffer temp = caps.scratch_int_buffer;
int max_vertex_attribs;
@@ -66,16 +69,26 @@
void clear() {
this.elementArrayBuffer = 0;
this.arrayBuffer = 0;
- this.glClientActiveTexture = 0;
- Arrays.fill(glVertexAttribPointer_buffer, null);
+ this.glClientActiveTexture = 0;
+ Arrays.fill(glVertexAttribPointer_buffer, null);
Arrays.fill(glTexCoordPointer_buffer, null);
+
+ this.pixelPackBuffer = 0;
+ this.pixelUnpackBuffer = 0;
}
- void copy(BaseReferences references) {
- this.elementArrayBuffer = references.elementArrayBuffer;
- this.arrayBuffer = references.arrayBuffer;
- this.glClientActiveTexture = references.glClientActiveTexture;
- System.arraycopy(references.glVertexAttribPointer_buffer, 0, glVertexAttribPointer_buffer, 0, glVertexAttribPointer_buffer.length);
- System.arraycopy(references.glTexCoordPointer_buffer, 0, glTexCoordPointer_buffer, 0, glTexCoordPointer_buffer.length);
+ void copy(BaseReferences references, int mask) {
+ if ( (mask & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0 ) {
+ this.elementArrayBuffer = references.elementArrayBuffer;
+ this.arrayBuffer = references.arrayBuffer;
+ this.glClientActiveTexture = references.glClientActiveTexture;
+ System.arraycopy(references.glVertexAttribPointer_buffer, 0, glVertexAttribPointer_buffer, 0, glVertexAttribPointer_buffer.length);
+ System.arraycopy(references.glTexCoordPointer_buffer, 0, glTexCoordPointer_buffer, 0, glTexCoordPointer_buffer.length);
+ }
+
+ if ( (mask & GL11.GL_CLIENT_PIXEL_STORE_BIT) != 0 ) {
+ this.pixelPackBuffer = references.pixelPackBuffer;
+ this.pixelUnpackBuffer = references.pixelUnpackBuffer;
+ }
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2009-09-08 12:27:59 UTC (rev 3236)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLChecks.java 2009-09-08 15:07:15 UTC (rev 3237)
@@ -110,25 +110,25 @@
/** Helper method to ensure that pixel pack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
static void ensurePackPBOdisabled(ContextCapabilities caps) {
- if ((caps.GL_ARB_pixel_buffer_object || caps.GL_EXT_pixel_buffer_object || caps.OpenGL21) && !checkBufferObject(caps, GL21.GL_PIXEL_PACK_BUFFER_BINDING, false))
+ if ( StateTracker.getReferencesStack(caps).getReferences().pixelPackBuffer != 0 )
throw new OpenGLException("Cannot use Buffers when Pixel Pack Buffer Object is enabled");
}
/** Helper method to ensure that pixel pack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
static void ensurePackPBOenabled(ContextCapabilities caps) {
- if ((caps.GL_ARB_pixel_buffer_object || caps.GL_EXT_pixel_buffer_object || caps.OpenGL21) && !checkBufferObject(caps, GL21.GL_PIXEL_PACK_BUFFER_BINDING, true))
+ if ( StateTracker.getReferencesStack(caps).getReferences().pixelPackBuffer == 0 )
throw new OpenGLException("Cannot use offsets when Pixel Pack Buffer Object is disabled");
}
/** Helper method to ensure that pixel unpack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */
static void ensureUnpackPBOdisabled(ContextCapabilities caps) {
- if ((caps.GL_ARB_pixel_buffer_object || caps.GL_EXT_pixel_buffer_object || caps.OpenGL21) && !checkBufferObject(caps, GL21.GL_PIXEL_UNPACK_BUFFER_BINDING, false))
+ if ( StateTracker.getReferencesStack(caps).getReferences().pixelUnpackBuffer != 0 )
throw new OpenGLException("Cannot use Buffers when Pixel Unpack Buffer Object is enabled");
}
/** Helper method to ensure that pixel unpack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */
static void ensureUnpackPBOenabled(ContextCapabilities caps) {
- if ((caps.GL_ARB_pixel_buffer_object || caps.GL_EXT_pixel_buffer_object || caps.OpenGL21) && !checkBufferObject(caps, GL21.GL_PIXEL_UNPACK_BUFFER_BINDING, true))
+ if ( StateTracker.getReferencesStack(caps).getReferences().pixelUnpackBuffer == 0 )
throw new OpenGLException("Cannot use offsets when Pixel Unpack Buffer Object is disabled");
}
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/ReferencesStack.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/ReferencesStack.java 2009-09-08 12:27:59 UTC (rev 3236)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/ReferencesStack.java 2009-09-08 15:07:15 UTC (rev 3237)
@@ -44,12 +44,15 @@
if (pos == references_stack.length) {
growStack();
}
- references_stack[pos].copy(references_stack[pos - 1]);
+ references_stack[pos].copy(references_stack[pos - 1], GL11.GL_ALL_CLIENT_ATTRIB_BITS);
}
- public References popState() {
+ public References popState(int mask) {
References result = references_stack[stack_pos--];
+
+ references_stack[stack_pos].copy(result, ~mask);
result.clear();
+
return result;
}
@@ -58,10 +61,10 @@
System.arraycopy(references_stack, 0, new_references_stack, 0, references_stack.length);
references_stack = new_references_stack;
references_stack[references_stack.length - 1] = new References(GLContext.getCapabilities());
- }
+ }
ReferencesStack() {
- ContextCapabilities caps = GLContext.getCapabilities();
+ ContextCapabilities caps = GLContext.getCapabilities();
references_stack = new References[1];
stack_pos = 0;
for (int i = 0; i < references_stack.length; i++)
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java 2009-09-08 12:27:59 UTC (rev 3236)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/StateTracker.java 2009-09-08 15:07:15 UTC (rev 3237)
@@ -45,9 +45,7 @@
}
private void doPopAttrib() {
- if ((attrib_stack.popState() & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0) {
- references_stack.popState();
- }
+ references_stack.popState(attrib_stack.popState());
}
static void pushAttrib(ContextCapabilities caps, int mask) {
@@ -56,9 +54,7 @@
private void doPushAttrib(int mask) {
attrib_stack.pushState(mask);
- if ((mask & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0) {
- references_stack.pushState();
- }
+ references_stack.pushState();
}
static ReferencesStack getReferencesStack(ContextCapabilities caps) {
@@ -74,6 +70,13 @@
case GL15.GL_ARRAY_BUFFER:
references_stack.getReferences().arrayBuffer = buffer;
break;
+ case GL21.GL_PIXEL_PACK_BUFFER:
+ references_stack.getReferences().pixelPackBuffer = buffer;
+ break;
+ case GL21.GL_PIXEL_UNPACK_BUFFER:
+ references_stack.getReferences().pixelUnpackBuffer = buffer;
+ break;
+
}
}
}
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java 2009-09-08 12:27:59 UTC (rev 3236)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java 2009-09-08 15:07:15 UTC (rev 3237)
@@ -69,7 +69,7 @@
private final static String REFERENCES_PARAMETER_NAME = "references";
private static boolean first_round = true;
-
+
// Process any set of annotations
private static final Collection<String> supportedAnnotations =
unmodifiableCollection(Arrays.asList("*"));
@@ -120,19 +120,19 @@
}
}
}
-
+
private static void generateCopiesFromParameters(PrintWriter writer, InterfaceDeclaration interface_decl, MethodDeclaration method) {
for (ParameterDeclaration param : method.getParameters()) {
CachedReference cached_reference_annotation = param.getAnnotation(CachedReference.class);
if (cached_reference_annotation != null && cached_reference_annotation.name().length() == 0) {
Class nio_type = Utils.getNIOBufferType(param.getType());
String reference_name = Utils.getReferenceName(interface_decl, method, param);
- writer.print("\t\tthis." + reference_name + " = ");
+ writer.print("\t\t\tthis." + reference_name + " = ");
writer.println(REFERENCES_PARAMETER_NAME + "." + reference_name + ";");
}
}
}
-
+
private static void generateClearsFromMethods(PrintWriter writer, InterfaceDeclaration interface_decl) {
for (MethodDeclaration method : interface_decl.getMethods()) {
generateClearsFromParameters(writer, interface_decl, method);
@@ -158,7 +158,7 @@
}
}
}
-
+
private static void generateReferencesFromMethods(PrintWriter writer, InterfaceDeclaration interface_decl) {
for (MethodDeclaration method : interface_decl.getMethods()) {
generateReferencesFromParameters(writer, interface_decl, method);
@@ -182,12 +182,14 @@
generateReferencesFromMethods(writer, interface_decl);
}
writer.println();
- writer.println("\tvoid copy(" + REFERENCES_CLASS_NAME + " " + REFERENCES_PARAMETER_NAME + ") {");
- writer.println("\t\tsuper.copy(" + REFERENCES_PARAMETER_NAME + ");");
+ writer.println("\tvoid copy(" + REFERENCES_CLASS_NAME + " " + REFERENCES_PARAMETER_NAME + ", int mask) {");
+ writer.println("\t\tsuper.copy(" + REFERENCES_PARAMETER_NAME + ", mask);");
+ writer.println("\t\tif ( (mask & GL11.GL_CLIENT_VERTEX_ARRAY_BIT) != 0 ) {");
for (TypeDeclaration typedecl : interface_decls) {
InterfaceDeclaration interface_decl = (InterfaceDeclaration)typedecl;
generateCopiesFromMethods(writer, interface_decl);
}
+ writer.println("\t\t}");
writer.println("\t}");
writer.println("\tvoid clear() {");
writer.println("\t\tsuper.clear();");
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2009-09-08 12:27:59 UTC (rev 3236)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL11.java 2009-09-08 15:07:15 UTC (rev 3237)
@@ -1258,7 +1258,7 @@
void glShadeModel(@GLenum int mode);
@DeprecatedGL
- void glSelectBuffer(@AutoSize("buffer") @GLsizei int size, @CachedReference @GLuint IntBuffer buffer);
+ void glSelectBuffer(@AutoSize("buffer") @GLsizei int size, @GLuint IntBuffer buffer);
void glScissor(int x, int y, @GLsizei int width, @GLsizei int height);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
