shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-04-08 16:04:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added support for PIXEL_STORE state tracking.

Browse source 
Changed PBO GLChecks to use LWJGL's state tracking instead of using glGetInteger.
This commit is contained in:
Ioannis Tsakpinis 2009-09-08 15:07:15 +00:00
parent f4eb23f860
commit 9a5f795a84
6 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/java/org/lwjgl/opengl/BaseReferences.java
View file

@ -41,9 +41,12 @@ class BaseReferences {
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 @@ class BaseReferences {
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;
}
}
}

8
src/java/org/lwjgl/opengl/GLChecks.java
View file

@ -110,25 +110,25 @@ class GLChecks {
/** 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");
}

11
src/java/org/lwjgl/opengl/ReferencesStack.java
View file

@ -44,12 +44,15 @@ class ReferencesStack {
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 @@ class ReferencesStack {
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++)

15
src/java/org/lwjgl/opengl/StateTracker.java
View file

@ -45,9 +45,7 @@ final class StateTracker {
}
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 @@ final class StateTracker {
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 @@ final class StateTracker {
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;
}
}
}

16
src/java/org/lwjgl/util/generator/ReferencesGeneratorProcessorFactory.java
View file

@ -69,7 +69,7 @@ public class ReferencesGeneratorProcessorFactory implements AnnotationProcessorF
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 @@ public class ReferencesGeneratorProcessorFactory implements AnnotationProcessorF
}
}
}
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 @@ public class ReferencesGeneratorProcessorFactory implements AnnotationProcessorF
}
}
}
private static void generateReferencesFromMethods(PrintWriter writer, InterfaceDeclaration interface_decl) {
for (MethodDeclaration method : interface_decl.getMethods()) {
generateReferencesFromParameters(writer, interface_decl, method);
@ -182,12 +182,14 @@ public class ReferencesGeneratorProcessorFactory implements AnnotationProcessorF
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();");