summaryrefslogtreecommitdiffstats
path: root/src/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/java/com')
-rwxr-xr-xsrc/java/com/jogamp/gluegen/runtime/Buffers.java (renamed from src/java/com/jogamp/gluegen/runtime/BufferFactory.java)4
-rw-r--r--src/java/com/jogamp/gluegen/runtime/Platform.java2
-rw-r--r--src/java/com/jogamp/gluegen/runtime/PointerBuffer.java6
-rw-r--r--src/java/com/sun/gluegen/JavaConfiguration.java6
-rw-r--r--src/java/com/sun/gluegen/JavaEmitter.java8
-rw-r--r--src/java/com/sun/gluegen/JavaMethodBindingEmitter.java36
-rwxr-xr-xsrc/java/com/sun/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java34
-rwxr-xr-xsrc/java/com/sun/gluegen/opengl/GLConfiguration.java2
-rw-r--r--src/java/com/sun/gluegen/test/TestStructAccessorEndian.java2
9 files changed, 50 insertions, 50 deletions
diff --git a/src/java/com/jogamp/gluegen/runtime/BufferFactory.java b/src/java/com/jogamp/gluegen/runtime/Buffers.java
index 4ab64ff..843d8a6 100755
--- a/src/java/com/jogamp/gluegen/runtime/BufferFactory.java
+++ b/src/java/com/jogamp/gluegen/runtime/Buffers.java
@@ -45,7 +45,7 @@ import java.nio.*;
* @author Sven Gothel
* @author Michael Bien
*/
-public class BufferFactory {
+public class Buffers {
public static final int SIZEOF_BYTE = 1;
public static final int SIZEOF_SHORT = 2;
@@ -55,7 +55,7 @@ public class BufferFactory {
public static final int SIZEOF_LONG = 8;
public static final int SIZEOF_DOUBLE = 8;
- private BufferFactory() {}
+ private Buffers() {}
/**
* Allocates a new direct ByteBuffer with the specified number of
diff --git a/src/java/com/jogamp/gluegen/runtime/Platform.java b/src/java/com/jogamp/gluegen/runtime/Platform.java
index 7c5e97e..8245b51 100644
--- a/src/java/com/jogamp/gluegen/runtime/Platform.java
+++ b/src/java/com/jogamp/gluegen/runtime/Platform.java
@@ -60,7 +60,7 @@ public class Platform {
JAVA_SE = se;
// byte order
- ByteBuffer tst_b = BufferFactory.newDirectByteBuffer(BufferFactory.SIZEOF_INT); // 32bit in native order
+ ByteBuffer tst_b = Buffers.newDirectByteBuffer(Buffers.SIZEOF_INT); // 32bit in native order
IntBuffer tst_i = tst_b.asIntBuffer();
ShortBuffer tst_s = tst_b.asShortBuffer();
tst_i.put(0, 0x0A0B0C0D);
diff --git a/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java
index bd73e56..ff1bc2e 100644
--- a/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java
+++ b/src/java/com/jogamp/gluegen/runtime/PointerBuffer.java
@@ -58,9 +58,9 @@ public abstract class PointerBuffer {
public static PointerBuffer allocateDirect(int size) {
if (Platform.isJavaSE()) {
- return new PointerBufferSE(BufferFactory.newDirectByteBuffer(elementSize() * size));
+ return new PointerBufferSE(Buffers.newDirectByteBuffer(elementSize() * size));
} else {
- return new PointerBufferME_CDC_FP(BufferFactory.newDirectByteBuffer(elementSize() * size));
+ return new PointerBufferME_CDC_FP(Buffers.newDirectByteBuffer(elementSize() * size));
}
}
@@ -87,7 +87,7 @@ public abstract class PointerBuffer {
}
public static int elementSize() {
- return CPU.is32Bit() ? BufferFactory.SIZEOF_INT : BufferFactory.SIZEOF_LONG;
+ return CPU.is32Bit() ? Buffers.SIZEOF_INT : Buffers.SIZEOF_LONG;
}
public int limit() {
diff --git a/src/java/com/sun/gluegen/JavaConfiguration.java b/src/java/com/sun/gluegen/JavaConfiguration.java
index 3683e29..2bcb17a 100644
--- a/src/java/com/sun/gluegen/JavaConfiguration.java
+++ b/src/java/com/sun/gluegen/JavaConfiguration.java
@@ -104,7 +104,7 @@ public class JavaConfiguration {
/**
* The package in which the generated glue code expects to find its
- * run-time helper classes (BufferFactory, CPU,
+ * run-time helper classes (Buffer, CPU,
* StructAccessor). Defaults to "com.jogamp.gluegen.runtime".
*/
private String gluegenRuntimePackage = "com.jogamp.gluegen.runtime";
@@ -308,7 +308,7 @@ public class JavaConfiguration {
}
/** Returns the package in which the generated glue code expects to
- find its run-time helper classes (BufferFactory, CPU,
+ find its run-time helper classes (Buffer, CPU,
StructAccessor). Defaults to "com.jogamp.gluegen.runtime". */
public String gluegenRuntimePackage() {
return gluegenRuntimePackage;
@@ -1500,7 +1500,7 @@ public class JavaConfiguration {
restOfLine = restOfLine.trim();
// Construct a JavaPrologue for this
addJavaPrologueOrEpilogue(functionName,
- "BufferFactory.rangeCheck" +
+ "Buffers.rangeCheck" +
(inBytes ? "Bytes" : "") +
"({" + argNum + "}, " + restOfLine + ");",
true);
diff --git a/src/java/com/sun/gluegen/JavaEmitter.java b/src/java/com/sun/gluegen/JavaEmitter.java
index b2f7578..0759d81 100644
--- a/src/java/com/sun/gluegen/JavaEmitter.java
+++ b/src/java/com/sun/gluegen/JavaEmitter.java
@@ -693,10 +693,10 @@ public class JavaEmitter implements GlueEmitter {
// public void fooMethod(Buffer arg) {
// ... bounds checks, etc. ...
//
- // boolean arg_direct = arg != null && BufferFactory.isDirect(arg);
+ // boolean arg_direct = arg != null && Buffers.isDirect(arg);
//
- // fooMethod0(arg_direct?arg:BufferFactory.getArray(arg),
- // arg_direct?BufferFactory.getDirectBufferByteOffset(arg):BufferFactory.getIndirectBufferByteOffset(arg),
+ // fooMethod0(arg_direct?arg:Buffers.getArray(arg),
+ // arg_direct?Buffers.getDirectBufferByteOffset(arg):Buffers.getIndirectBufferByteOffset(arg),
// arg_direct,
// ... );
// }
@@ -921,7 +921,7 @@ public class JavaEmitter implements GlueEmitter {
writer.println();
if (doBaseClass) {
writer.println(" public static " + containingTypeName + " create() {");
- writer.println(" return create(BufferFactory.newDirectByteBuffer(size()));");
+ writer.println(" return create(Buffers.newDirectByteBuffer(size()));");
writer.println(" }");
writer.println();
writer.println(" public static " + containingTypeName + " create(java.nio.ByteBuffer buf) {");
diff --git a/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java b/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java
index da5484b..8db4a3b 100644
--- a/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java
+++ b/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java
@@ -450,12 +450,12 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
JavaType javaType = binding.getJavaArgumentType(i);
if (javaType.isNIOBuffer()) {
if (directNIOOnly) {
- writer.println(" if (!BufferFactory.isDirect(" + getArgumentName(i) + "))");
+ writer.println(" if (!Buffers.isDirect(" + getArgumentName(i) + "))");
writer.println(" throw new " + getRuntimeExceptionType() + "(\"Argument \\\"" +
getArgumentName(i) + "\\\" was not a direct buffer\");");
} else {
writer.print(" boolean " + isNIOArgName(i) + " = ");
- writer.println(getArgumentName(i) + " != null && BufferFactory.isDirect(" + getArgumentName(i) + ");");
+ writer.println(getArgumentName(i) + " != null && Buffers.isDirect(" + getArgumentName(i) + ");");
}
} else if (javaType.isNIOBufferArray()) {
// All buffers passed down in an array of NIO buffers must be direct
@@ -465,13 +465,13 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
// Check direct buffer properties of all buffers within
writer.println(" if (" + argName + " != null) {");
writer.println(" for (int _ctr = 0; _ctr < " + argName + ".length; _ctr++) {");
- writer.println(" if (!BufferFactory.isDirect(" + argName + "[_ctr])) {");
+ writer.println(" if (!Buffers.isDirect(" + argName + "[_ctr])) {");
writer.println(" throw new " + getRuntimeExceptionType() +
"(\"Element \" + _ctr + \" of argument \\\"" +
getArgumentName(i) + "\\\" was not a direct buffer\");");
writer.println(" }");
// get the Buffer Array offset values and save them into another array to send down to JNI
- writer.print (" " + arrayName + "[_ctr] = BufferFactory.getDirectBufferByteOffset(");
+ writer.print (" " + arrayName + "[_ctr] = Buffers.getDirectBufferByteOffset(");
writer.println(argName + "[_ctr]);");
writer.println(" }");
writer.println(" }");
@@ -594,13 +594,13 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
writer.print( getArgumentName(i)+ " != null ? " + getArgumentName(i) + ".getBuffer() : null");
} else {
writer.print( isNIOArgName(i) + " ? ( " + getArgumentName(i)+ " != null ? " + getArgumentName(i) + ".getBuffer() : null )");
- writer.print( " : BufferFactory.getArray(" + getArgumentName(i) + ")" );
+ writer.print( " : Buffers.getArray(" + getArgumentName(i) + ")" );
}
} else {
if (directNIOOnly) {
writer.print( getArgumentName(i) );
} else {
- writer.print( isNIOArgName(i) + " ? " + getArgumentName(i) + " : BufferFactory.getArray(" + getArgumentName(i) + ")" );
+ writer.print( isNIOArgName(i) + " ? " + getArgumentName(i) + " : Buffers.getArray(" + getArgumentName(i) + ")" );
}
}
} else if (type.isArrayOfCompoundTypeWrappers()) {
@@ -617,26 +617,26 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
if (type.isNIOBuffer()) {
if (directNIOOnly) {
- writer.print( ", BufferFactory.getDirectBufferByteOffset(" + getArgumentName(i) + ")");
+ writer.print( ", Buffers.getDirectBufferByteOffset(" + getArgumentName(i) + ")");
} else {
- writer.print( ", " + isNIOArgName(i) + " ? BufferFactory.getDirectBufferByteOffset(" + getArgumentName(i) + ")");
- writer.print( " : BufferFactory.getIndirectBufferByteOffset(" + getArgumentName(i) + ")");
+ writer.print( ", " + isNIOArgName(i) + " ? Buffers.getDirectBufferByteOffset(" + getArgumentName(i) + ")");
+ writer.print( " : Buffers.getIndirectBufferByteOffset(" + getArgumentName(i) + ")");
}
} else if (type.isNIOBufferArray()) {
writer.print(", " + byteOffsetArrayArgName(i));
} else if (type.isPrimitiveArray()) {
if(type.isFloatArray()) {
- writer.print(", BufferFactory.SIZEOF_FLOAT * ");
+ writer.print(", Buffers.SIZEOF_FLOAT * ");
} else if(type.isDoubleArray()) {
- writer.print(", BufferFactory.SIZEOF_DOUBLE * ");
+ writer.print(", Buffers.SIZEOF_DOUBLE * ");
} else if(type.isByteArray()) {
writer.print(", ");
} else if(type.isLongArray()) {
- writer.print(", BufferFactory.SIZEOF_LONG * ");
+ writer.print(", Buffers.SIZEOF_LONG * ");
} else if(type.isShortArray()) {
- writer.print(", BufferFactory.SIZEOF_SHORT * ");
+ writer.print(", Buffers.SIZEOF_SHORT * ");
} else if(type.isIntArray()) {
- writer.print(", BufferFactory.SIZEOF_INT * ");
+ writer.print(", Buffers.SIZEOF_INT * ");
} else {
throw new RuntimeException("Unsupported type for calculating array offset argument for " +
getArgumentName(i) +
@@ -695,9 +695,9 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
String fmt = getReturnedArrayLengthExpression();
writer.println(" if (_res == null) return null;");
if (fmt == null) {
- writer.print(" return " + returnType.getName() + ".create(BufferFactory.nativeOrder(_res))");
+ writer.print(" return " + returnType.getName() + ".create(Buffers.nativeOrder(_res))");
} else {
- writer.println(" BufferFactory.nativeOrder(_res);");
+ writer.println(" Buffers.nativeOrder(_res);");
String expr = new MessageFormat(fmt).format(argumentNameArray());
PointerType cReturnTypePointer = binding.getCReturnType().asPointer();
CompoundType cReturnType = null;
@@ -716,7 +716,7 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
writer.println(" _res.position(_count * " + getReturnTypeString(true) + ".size());");
writer.println(" _res.limit ((1 + _count) * " + getReturnTypeString(true) + ".size());");
writer.println(" java.nio.ByteBuffer _tmp = _res.slice();");
- writer.println(" BufferFactory.nativeOrder(_tmp);");
+ writer.println(" Buffers.nativeOrder(_tmp);");
writer.println(" _res.position(0);");
writer.println(" _res.limit(_res.capacity());");
writer.println(" _retarray[_count] = " + getReturnTypeString(true) + ".create(_tmp);");
@@ -726,7 +726,7 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
writer.println(";");
} else if (returnType.isNIOBuffer()) {
writer.println(" if (_res == null) return null;");
- writer.println(" BufferFactory.nativeOrder(_res);");
+ writer.println(" Buffers.nativeOrder(_res);");
if (!returnType.isNIOByteBuffer()) {
// See whether we have to expand pointers to longs
if (getBinding().getCReturnType().pointerDepth() >= 2) {
diff --git a/src/java/com/sun/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java b/src/java/com/sun/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java
index 63d95fe..b4dc130 100755
--- a/src/java/com/sun/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java
+++ b/src/java/com/sun/gluegen/nativesig/NativeSignatureJavaMethodBindingEmitter.java
@@ -146,10 +146,10 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
if (type.isNIOBuffer() && !directNIOOnly) {
// Emit declarations for variables holding primitive arrays as type Object
// We don't know 100% sure we're going to use these at this point in the code, though
- writer.println(" Object " + getNIOBufferArrayName(i) + " = (_direct ? null : BufferFactory.getArray(" +
+ writer.println(" Object " + getNIOBufferArrayName(i) + " = (_direct ? null : Buffers.getArray(" +
getArgumentName(i) + "));");
} else if (type.isString()) {
- writer.println(" long " + binding.getArgumentName(i) + "_c_str = BufferFactoryInternal.newCString(" + binding.getArgumentName(i) + ");");
+ writer.println(" long " + binding.getArgumentName(i) + "_c_str = BuffersInternal.newCString(" + binding.getArgumentName(i) + ");");
}
// FIXME: going to need more of these for Buffer[] and String[], at least
}
@@ -275,9 +275,9 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
if (needsResultAssignment) {
writer.print(" _res = ");
if (returnType.isString()) {
- writer.print("BufferFactoryInternal.newJavaString(");
+ writer.print("BuffersInternal.newJavaString(");
} else if (returnType.isNIOByteBuffer()) {
- writer.print("BufferFactoryInternal.newDirectByteBuffer(");
+ writer.print("BuffersInternal.newDirectByteBuffer(");
}
} else {
writer.print(" ");
@@ -352,7 +352,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
if (binding.hasContainingType()) {
// Emit this pointer
assert(binding.getContainingType().isCompoundTypeWrapper());
- writer.print("BufferFactoryInternal.getDirectBufferAddress(");
+ writer.print("BuffersInternal.getDirectBufferAddress(");
writer.print("getBuffer()");
writer.print(")");
needComma = true;
@@ -377,7 +377,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
}
if (type.isCompoundTypeWrapper()) {
- writer.print("BufferFactoryInternal.getDirectBufferAddress(");
+ writer.print("BuffersInternal.getDirectBufferAddress(");
writer.print("((");
}
@@ -385,7 +385,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
if (!direct) {
writer.print(getNIOBufferArrayName(i));
} else {
- writer.print("BufferFactoryInternal.getDirectBufferAddress(");
+ writer.print("BuffersInternal.getDirectBufferAddress(");
writer.print(getArgumentName(i));
writer.print(")");
}
@@ -402,11 +402,11 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
if (type.isNIOBuffer()) {
if (direct) {
- writer.print("+ BufferFactory.getDirectBufferByteOffset(" + getArgumentName(i) + ")");
+ writer.print("+ Buffers.getDirectBufferByteOffset(" + getArgumentName(i) + ")");
} else {
- writer.print(", BufferFactoryInternal.arrayBaseOffset(" +
+ writer.print(", BuffersInternal.arrayBaseOffset(" +
getNIOBufferArrayName(i) +
- ") + BufferFactory.getIndirectBufferByteOffset(" + getArgumentName(i) + ")");
+ ") + Buffers.getIndirectBufferByteOffset(" + getArgumentName(i) + ")");
}
} else if (type.isNIOBufferArray()) {
writer.print(", " + byteOffsetArrayArgName(i));
@@ -415,19 +415,19 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
// Add Array offset parameter for primitive arrays
if (type.isPrimitiveArray()) {
writer.print(", ");
- writer.print("BufferFactoryInternal.arrayBaseOffset(" + getArgumentName(i) + ") + ");
+ writer.print("BuffersInternal.arrayBaseOffset(" + getArgumentName(i) + ") + ");
if(type.isFloatArray()) {
- writer.print("BufferFactory.SIZEOF_FLOAT * ");
+ writer.print("Buffers.SIZEOF_FLOAT * ");
} else if(type.isDoubleArray()) {
- writer.print("BufferFactory.SIZEOF_DOUBLE * ");
+ writer.print("Buffers.SIZEOF_DOUBLE * ");
} else if(type.isByteArray()) {
writer.print("1 * ");
} else if(type.isLongArray()) {
- writer.print("BufferFactory.SIZEOF_LONG * ");
+ writer.print("Buffers.SIZEOF_LONG * ");
} else if(type.isShortArray()) {
- writer.print("BufferFactory.SIZEOF_SHORT * ");
+ writer.print("Buffers.SIZEOF_SHORT * ");
} else if(type.isIntArray()) {
- writer.print("BufferFactory.SIZEOF_INT * ");
+ writer.print("Buffers.SIZEOF_INT * ");
} else {
throw new RuntimeException("Unsupported type for calculating array offset argument for " +
getArgumentName(i) +
@@ -455,7 +455,7 @@ public class NativeSignatureJavaMethodBindingEmitter extends GLJavaMethodBinding
JavaType type = binding.getJavaArgumentType(i);
if (type.isString()) {
writer.println(";");
- writer.println(" BufferFactoryInternal.freeCString(" + binding.getArgumentName(i) + "_c_str);");
+ writer.println(" BuffersInternal.freeCString(" + binding.getArgumentName(i) + "_c_str);");
}
// FIXME: will need more of these cleanups for things like Buffer[] and String[] (see above)
}
diff --git a/src/java/com/sun/gluegen/opengl/GLConfiguration.java b/src/java/com/sun/gluegen/opengl/GLConfiguration.java
index 19cf85a..6d08a10 100755
--- a/src/java/com/sun/gluegen/opengl/GLConfiguration.java
+++ b/src/java/com/sun/gluegen/opengl/GLConfiguration.java
@@ -173,7 +173,7 @@ public class GLConfiguration extends ProcAddressConfiguration {
if (emitter.isBufferObjectMethodBinding(binding)) {
for (Iterator<String> iter = res.iterator(); iter.hasNext(); ) {
String line = iter.next();
- if (line.indexOf("BufferFactory.rangeCheck") >= 0) {
+ if (line.indexOf("Buffers.rangeCheck") >= 0) {
iter.remove();
}
}
diff --git a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java
index 362116d..89ccb5a 100644
--- a/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java
+++ b/src/java/com/sun/gluegen/test/TestStructAccessorEndian.java
@@ -14,7 +14,7 @@ public class TestStructAccessorEndian {
System.out.println("OS: <"+os+"> CPU: <"+cpu+"> Bits: <"+bitsPtr+"/"+bitsProp+">");
System.out.println("CPU is: "+ (CPU.is32Bit()?"32":"64") + " bit");
System.out.println("Buffer is in: "+ (Platform.isLittleEndian()?"little":"big") + " endian");
- ByteBuffer tst = BufferFactory.newDirectByteBuffer(BufferFactory.SIZEOF_LONG * 3);
+ ByteBuffer tst = Buffers.newDirectByteBuffer(Buffers.SIZEOF_LONG * 3);
StructAccessor acc = new StructAccessor(tst);
acc.setLongAt(0, 0x0123456789ABCDEFL);
acc.setLongAt(1, 0x8877665544332211L);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 05:52:34 +0000