diff options
author | sg215889 <[email protected]> | 2009-07-13 01:29:44 -0700 |
---|---|---|
committer | sg215889 <[email protected]> | 2009-07-13 01:29:44 -0700 |
commit | 558389f22d7a257e422ae50385364dcc74c4f106 (patch) | |
tree | c56820b796661a8a25d6da9dbbee8b8a9d352114 | |
parent | 29a8ca00f0e153ab30e756f4db1ecfa425e7e45c (diff) |
Add: Extended support for CVM:
- GLX, CGL, WGL
- GL2ES12 desktop ES1 and ES2 common profile
Add: BufferFactory: Determine the Buffer's Endianess
Add: com.sun.gluegen.runtime.PointerBuffer
- Solution for CDC/CVM (no LongBuffer), holds a buffer of pointer objects
in native endian format and converts natively passed 32bit pointers to 64 bit.
- supports a few Buffer mechanics, so the BufferFactory can easily use them.
- behaves as an NIO Buffer, code generation
- included a unit test
Add: StructAccessor get/set long value, incl. endian check
-rw-r--r-- | make/make.gluegen.all.linux-x86.sh | 14 | ||||
-rw-r--r-- | make/make.gluegen.all.linux-x86_64.sh | 14 | ||||
-rw-r--r-- | make/make.gluegen.cdcfp.linux-x86.sh | 15 | ||||
-rw-r--r-- | make/make.gluegen.cdcfp.macosx.sh | 12 | ||||
-rwxr-xr-x | src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp | 78 | ||||
-rwxr-xr-x | src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase | 63 | ||||
-rw-r--r-- | test/TestPointerBufferEndian.java | 33 | ||||
-rw-r--r-- | test/TestStructAccessorEndian.java | 33 |
8 files changed, 262 insertions, 0 deletions
diff --git a/make/make.gluegen.all.linux-x86.sh b/make/make.gluegen.all.linux-x86.sh new file mode 100644 index 0000000..58c4215 --- /dev/null +++ b/make/make.gluegen.all.linux-x86.sh @@ -0,0 +1,14 @@ +#! /bin/sh + +. ../../setenv-build-jogl-x86.sh + +# -Dc.compiler.debug=true + +ant -v \ + -Drootrel.build=build-x86 \ + -Dgluegen.cpptasks.detected.os=true \ + -DisUnix=true \ + -DisLinux=true \ + -DisLinuxX86=true \ + -DisX11=true \ + $* 2>&1 | tee make.gluegen.all.linux-x86.log diff --git a/make/make.gluegen.all.linux-x86_64.sh b/make/make.gluegen.all.linux-x86_64.sh new file mode 100644 index 0000000..a787c57 --- /dev/null +++ b/make/make.gluegen.all.linux-x86_64.sh @@ -0,0 +1,14 @@ +#! /bin/sh + +. ../../setenv-build-jogl-x86_64.sh + +# -Dc.compiler.debug=true + +ant -v \ + -Drootrel.build=build-x86_64 \ + -Dgluegen.cpptasks.detected.os=true \ + -DisUnix=true \ + -DisLinux=true \ + -DisLinuxAMD64=true \ + -DisX11=true \ + $* 2>&1 | tee make.gluegen.all.linux-x86_64.log diff --git a/make/make.gluegen.cdcfp.linux-x86.sh b/make/make.gluegen.cdcfp.linux-x86.sh new file mode 100644 index 0000000..cc02d0f --- /dev/null +++ b/make/make.gluegen.cdcfp.linux-x86.sh @@ -0,0 +1,15 @@ +#! /bin/sh + +. ../../setenv-build-jogl-x86.sh + +# -Dc.compiler.debug=true + +ant -v \ + -DisCDCFP=true \ + -Drootrel.build=build-cdcfp-x86 \ + -Dgluegen.cpptasks.detected.os=true \ + -DisUnix=true \ + -DisLinux=true \ + -DisLinuxX86=true \ + -DisX11=true \ + $* 2>&1 | tee make.gluegen.cdcfp.linux-x86.log diff --git a/make/make.gluegen.cdcfp.macosx.sh b/make/make.gluegen.cdcfp.macosx.sh new file mode 100644 index 0000000..016cb8d --- /dev/null +++ b/make/make.gluegen.cdcfp.macosx.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +if [ -e /devtools/etc/profile.ant ] ; then + . /devtools/etc/profile.ant +fi + +# -Dc.compiler.debug=true + +ant -v \ + -DisCDCFP=true \ + -Drootrel.build=build-cdcfp-macosx \ + $* 2>&1 | tee make.gluegen.cdcfp.macosx-x86.log diff --git a/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp b/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp new file mode 100755 index 0000000..b2d216e --- /dev/null +++ b/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javame_cdc_fp @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution 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 Sun Microsystems, Inc. or the names of + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * + * You acknowledge that this software is not designed or intended for use + * in the design, construction, operation or maintenance of any nuclear + * facility. + */ + +package com.sun.gluegen.runtime; + +import java.nio.*; + +public class PointerBuffer { + private ByteBuffer bb; + private IntBuffer ib; + + public PointerBuffer(ByteBuffer bb) { + this.bb = bb; + this.ib = bb.asIntBuffer(); + } + + public ByteBuffer getBuffer() { + return bb; + } + + /** Retrieves the long at the specified slot (8-byte offset). */ + public long get(int slot) { + slot = slot << 1 ; // 8-byte to 4-byte offset + long lo = 0x00000000FFFFFFFFL & ( (long) ib.get(slot) ); + long hi = 0x00000000FFFFFFFFL & ( (long) ib.get(slot+1) ); + if(BufferFactory.isLittleEndian()) { + return hi << 32 | lo ; + } + return lo << 32 | hi ; + } + + /** Puts a long at the specified slot (8-byte offset). */ + public void put(int slot, long v) { + slot = slot << 1 ; // 8-byte to 4-byte offset + int lo = (int) ( ( v ) & 0x00000000FFFFFFFFL ) ; + int hi = (int) ( ( v >> 32 ) & 0x00000000FFFFFFFFL ) ; + if(BufferFactory.isLittleEndian()) { + ib.put(slot, lo); + ib.put(slot+1, hi); + } else { + ib.put(slot, hi); + ib.put(slot+1, lo); + } + } +} diff --git a/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase b/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase new file mode 100755 index 0000000..921d186 --- /dev/null +++ b/src/java/com/sun/gluegen/runtime/PointerBuffer.java.javase @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution 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 Sun Microsystems, Inc. or the names of + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * + * You acknowledge that this software is not designed or intended for use + * in the design, construction, operation or maintenance of any nuclear + * facility. + */ + +package com.sun.gluegen.runtime; + +import java.nio.*; + +public class PointerBuffer { + private ByteBuffer bb; + private LongBuffer lb; + + public PointerBuffer(ByteBuffer bb) { + this.bb = bb; + this.lb = bb.asLongBuffer(); + } + + public ByteBuffer getBuffer() { + return bb; + } + + /** Retrieves the long at the specified slot (8-byte offset). */ + public long get(int slot) { + return lb.get(slot); + } + + /** Puts a long at the specified slot (8-byte offset). */ + public void put(int slot, long v) { + lb.put(slot, v); + } +} diff --git a/test/TestPointerBufferEndian.java b/test/TestPointerBufferEndian.java new file mode 100644 index 0000000..43eda84 --- /dev/null +++ b/test/TestPointerBufferEndian.java @@ -0,0 +1,33 @@ + +import com.sun.gluegen.runtime.*; +import java.nio.*; + +public class TestPointerBufferEndian { + public static void main (String[] args) { + boolean direct = args.length>0 && args[0].equals("-direct"); + boolean ok = true; + System.out.println("Buffer is in: "+ (BufferFactory.isLittleEndian()?"little":"big") + " endian"); + PointerBuffer ptr = direct ? PointerBuffer.allocateDirect(3) : PointerBuffer.allocate(3); + ptr.put(0, 0x0123456789ABCDEFL); + ptr.put(1, 0x8877665544332211L); + ptr.put(2, 0xAFFEDEADBEEFAFFEL); + long v = ptr.get(0); + if( 0x0123456789ABCDEFL != v ) { + System.out.println("Err[0] shall 0x0123456789ABCDEF, is: "+Long.toHexString(v)); + ok=false; + } + v = ptr.get(1); + if( 0x8877665544332211L != v ) { + System.out.println("Err[1] shall 0x8877665544332211, is: "+Long.toHexString(v)); + ok=false; + } + v = ptr.get(2); + if( 0xAFFEDEADBEEFAFFEL != v ) { + System.out.println("Err[2] shall 0xAFFEDEADBEEFAFFE, is: "+Long.toHexString(v)); + ok=false; + } + if(!ok) { + throw new RuntimeException("Long conversion failure"); + } + } +} diff --git a/test/TestStructAccessorEndian.java b/test/TestStructAccessorEndian.java new file mode 100644 index 0000000..9d294ed --- /dev/null +++ b/test/TestStructAccessorEndian.java @@ -0,0 +1,33 @@ + +import com.sun.gluegen.runtime.*; +import java.nio.*; + +public class TestStructAccessorEndian { + public static void main (String args[]) { + boolean ok = true; + System.out.println("CPU is : "+ (CPU.isLittleEndian()?"little":"big") + " endian"); + ByteBuffer tst = BufferFactory.newDirectByteBuffer(BufferFactory.SIZEOF_LONG * 3); + StructAccessor acc = new StructAccessor(tst); + acc.setLongAt(0, 0x0123456789ABCDEF); + acc.setLongAt(1, 0x8877665544332211); + acc.setLongAt(2, 0xAFFEDEADBEEFAFFE); + long v = acc.getLongAt(0); + if( 0x0123456789ABCDEF != v ) { + System.out.println("Err[0] shall 0x0123456789ABCDEF, is: "+Long.toHexString(v)); + ok=false; + } + v = acc.getLongAt(1); + if( 0x8877665544332211 != v ) { + System.out.println("Err[1] shall 0x8877665544332211, is: "+Long.toHexString(v)); + ok=false; + } + v = acc.getLongAt(2); + if( 0xAFFEDEADBEEFAFFE != v ) { + System.out.println("Err[2] shall 0xAFFEDEADBEEFAFFE, is: "+Long.toHexString(v)); + ok=false; + } + if(!ok) { + throw new RuntimeException("Long conversion failure"); + } + } +} |