summaryrefslogtreecommitdiffstats
path: root/src/java
Commit message (Collapse)AuthorAgeFilesLines
* http://jogamp.org/bugzilla/show_bug.cgi?id=393Sven Gothel2010-04-081-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed junit test: test1 - Create seperate native libraries to reflect a real world example: test1 - the library to bind to (no more declaring __stdcall @nn functions) BindingTest1p1 - the dynamic fixed linkage binding test1p1, references dynamic library test1 at linktime. BindingTest1p2 - the dynamic runtime linkage binding test1p2, loads dynamic library test1 at runtime. Generic: - gluegen-cpptasks-base.xml - target 'gluegen.cpptasks.detect.os' Set new property 'system.env.library.path' DYLD_LIBRARY_PATH (macosx) LD_LIBRARY_PATH (unix) PATH (windows) - target 'gluegen.cpptasks.striplibs' Strips the symbols out of the native libraries in case c.compiler.debug is false. Maybe configured with the properties: c.strip.tool, c.strip.args - Using system.env.library.path in junit call to find the test1 library in case of runtime linkage and lookup (test1p2). - Use gluegen.cpptasks.striplibs for all native libs .. - Added macosx32 in analogy to macosx64, both defaults to true now - com.jogamp.common.os.WindowsDynamicLinkerImpl:lookupSymbol() - Added lookup for __stdcall @nn (stepping alignment 4, max-args: 12) in case no undecorated __cdecl symbol is found. Fixed Windows platform: - Use proper path.seperator on Windows. - test1.dll needs proper soname inside for fixed linkage (test1p1) hence the output name must be test1.dll, not libtest1.so +++ http://jogamp.org/bugzilla/show_bug.cgi?id=394 Fix MacOsX platform: The commit of cpptasks.jar, git hash 129e783741d91e9ee5cd7da5d5c962c32ec96b0b, broke the universal binary build on MacOSX. The above change used cpptasks-1.05b with a few patches in regards to crosscompilation, but missed one, which accepts the '-arch' argument for GccLinker undecorated. The new cpptasks.jar is vanilla 1.05b + cpptasks-1.0b5-darwin-patch.diff, the latter a more refined one. This version accepts the '-arch' argument undecorated on the darwin platform. +++
* Merge branch 'master' of github.com:mbien/gluegenMichael Bien2010-04-013-3/+4
|\
| * Fix 32bit masking / testsSven Gothel2010-04-013-3/+4
| |
* | fixed a bug introduced in commit 2fe517b9a2e1a680b50c7e1273897495800c5350 / ↵Michael Bien2010-04-011-7/+8
|/ | | | | | | hudson build 42. Object local PrintWriter was used instead of method local after an attempt to prevent the very same bug...
* fixed generated imports rudimentary (not DRY).. cleanup in work.Michael Bien2010-03-313-103/+105
|
* Merged with latest of mbienSven Gothel2010-03-3138-2983/+3041
|\
| * introduced com.jogamp.common.{nio,os} packages and moved some classes.Michael Bien2010-03-3122-36/+47
| |
| * refactoring and code cleanup in gluegen.opengl and gluegen.procaddress package.Michael Bien2010-03-3112-2784/+2716
| |
| * replaced int-flags with enums + code cleanup.Michael Bien2010-03-312-84/+54
| |
| * implemented better logging using java.util.logging.Michael Bien2010-03-315-86/+176
| |
| * introduced internal NativeBuffer interface, this can be made public as soon ↵Michael Bien2010-03-303-2/+50
| | | | | | | | | | | | we move to java language level 5. removed accidentally commited verbose javac property in build-junit.xml.
* | Buffer heritage added. Migrated old runtime tests.Sven Gothel2010-03-3110-310/+288
|/
* http://www.jogamp.org/bugzilla/show_bug.cgi?id=392Sven Gothel2010-03-301-0/+52
| | | | | | | | | | | | | | | | | | 32bit/64bit values and arrays are misrepresented - PointerBuffer: Adding methods PointeRBuffer referenceBuffer(int index, Buffer data) PointeRBuffer referenceBuffer(Buffer data) Buffer getReferencedBuffer(int index) Buffer getReferencedBuffer() Adding a reference of a given direct Buffer to this pointer buffer, and retrieving a previously referenced direct Buffer. This allows a more convenient handling of PointerBuffer with the user API's ..
* Merge branch 'master' of github.com:mbien/gluegenSven Gothel2010-03-301-5/+30
|\
| * added sizeOfBufferElem(Buffer buf) to Buffers.Michael Bien2010-03-291-4/+29
| |
| * made conctructor protected.Michael Bien2010-03-291-1/+1
| |
* | http://www.jogamp.org/bugzilla/show_bug.cgi?id=389Sven Gothel2010-03-305-13/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32bit/64bit values and arrays are misrepresented - PointerBuffer is used to map 64bit integer values, which is illegal due to the latest PointerBuffer changes, where the underlying ByteBuffer is either 32bit wide or 64bit wide (in respect to the pointer size). The PointerBuffer semantic itself is correct, but no more suitable to represent 64bit values and arrays. A Int64Buffer (LongBuffer does not exist in CDC/CVM patch) should be used instead. - Determine use of Int64Buffer and PointerBuffer Assuming the 1st step being solved, it has to determined for which cases gluegen shall map a type to a PointerBuffer. All pointer pointer types, regardless of a Opaque mapping, ie: +++ typedef struct __MYAPIConfig * MYAPIConfig; Opaque long MYAPIConfig void foo(MYAPIConfig * ptrarray); +++ The argument 'ptrarray' must be represented as a PointerBuffer otherwise data is misrepresented in case: - 32bit machines _and_ - array semantics - more than one value is being used Impl: java/com/sun/gluegen/JavaEmitter.java: - Checks ptr-ptr for Opaque values - Returns PointerBuffer mapping for ptr-ptr types - Allow PointerBuffer being mapped as String[] Very elaborated tests .. :) ++++++++++++ Misc Changes: - Added <Type>.put(<Type>Buffer src) for Int64Buffer/PointerBuffer
* | Resolved conflictsSven Gothel2010-03-2914-65/+399
|\|
| * renamed BufferFactory into Buffers.Michael Bien2010-03-299-50/+50
| |
| * moved several common utility methods from JOGL's BufferUtil to GlueGen's ↵Michael Bien2010-03-295-11/+345
| | | | | | | | BufferFactory.
* | New Int64Buffer type, which is being used for gluegen 'long *'Sven Gothel2010-03-298-13/+373
| |
* | Merge CPU to PlatformSven Gothel2010-03-2810-121/+76
|/
* (part2) merged all cdc_fp special cases into one common superclass for each ↵Michael Bien2010-03-2810-1223/+949
| | | | | | | special case. introduced Platform as utility for querying platform information. special cdc build with cdc_fp bootclasspath temporary dissabled.
* (part 1) merged all cdc_fp special cases into one common superclass for each ↵Michael Bien2010-03-283-0/+0
| | | | | | | special case. introduced Platform as utility for querying platform information. special cdc build with cdc_fp bootclasspath temporary dissabled.
* Merge with mbien's 2ea8c93d5fd27207872b97c964e3f8af5ac850c6Sven Gothel2010-03-2828-49/+45
|\
| * com.sun.opengl -> com.jogamp.opengl.Michael Bien2010-03-271-1/+1
| |
| * renamed com.sun.gluegen.runtime -> com.jogamp.gluegen.runtime.Michael Bien2010-03-2728-48/+44
| |
* | http://www.jogamp.org/bugzilla/show_bug.cgi?id=389Sven Gothel2010-03-287-320/+163
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mixed types in generated code are functioning now, even though not all permutations are generated - still. However, this patch merges the indirect object passing, wheather it is a primitive array or an indirect NIO buffer, incl. PointerBuffer. This allows the usage of only one JNI functions for all combinations. Only in case of NIODirectOnly, the simplified direct only '0' variation is created - otherwise the parametrized '1' variant. The junit tests proves the implementation and almost completes the gluegen junit tests coverage for JavaEmitter and ProcAddressEmitter. Impact/Result: - Working mixed array types - JOGL GL2 native library shrunk around 30% - Simplified gluegen code - Almost complete gluegen junit tests TODO: Complete permutations of array/NIO arguments, if desired. ++++ Misc changes: - NativeLibrary implements DynamicLookupHelper: lookupFunction() -> dynamicLookupFunction()
* seperated cli processing from main logic.Michael Bien2010-03-241-290/+301
|
* fixed regression in constant emission where a type suffix (e.g. 'f') was ↵Michael Bien2010-03-222-4/+14
| | | | | | illegally added after a closing bracket. added testcase.
* Drop PointerBuffer.wrapNative2Java(..)Sven Gothel2010-03-193-64/+40
| | | | | | in favor of a simple PointerBuffer.wrap(..), due to the new semantics, ie internal integer/long presentation. Fixed the javame code in this regard.
* fixed JavaEmitter to support unsigned defines.Michael Bien2010-03-121-1/+9
|
* PCPP supports now simple macros.Michael Bien2010-02-202-20/+34
| | | | fixed 'deprecated API' warnings in GlueGen.
* better exception handling in GlueGen.Michael Bien2010-02-202-127/+256
| | | | WIP: refactored PCPP to implement macros, next step is to replace StreamTokenizer with Scanner (we need a propper look ahead).
* junit test code cleanup and some build preperations for hudson.Michael Bien2010-02-121-1/+2
|
* added support for arrays in generated StructAccessors.Michael Bien2010-02-124-39/+198
| | | | | Specifying JavaClass or JavaImplClass is no longer a requirement. It is now possible to generate StructAccessors from c headers without emitting any other binding code (force with EmitStruct <name>).
* generated pointer variable names have now a more descriptive name.Michael Bien2010-02-031-47/+46
| | | | a few 'introduce variable' refactorings for argument names.
* PointerBuffer supports now 32bit architectures.Michael Bien2010-01-192-18/+39
|
* is32Bit field is now immutable to help hotspot with inlining.Michael Bien2010-01-181-41/+27
| | | | code cleanup.
* fixed off-by-one bug in put and get.Michael Bien2010-01-122-6/+24
| | | | | implemented method chaining pattern. added position(int pos) method.
* fixed emitted code for buffer-array mixing.Michael Bien2010-01-124-17/+27
| | | | | removed workaround in BufferFactory since it is no longer needed. small code cleanup (generator java 5 migration).
* continued with code cleanup in com.sun.gluegen.cgram and ↵Michael Bien2009-12-0218-563/+647
| | | | com.sun.gluegen.opengl packages.
* Code cleanup. Ported package com.sun.gluegen to java 5 language level.Michael Bien2009-12-0118-644/+624
|
* temporary workaround in BufferFactory.isDirect(). Changed behavior to return ↵Michael Bien2009-11-302-4/+4
| | | | | | false with null as parameter to workaround buffer/array mixing bug. Should be revisited to improve performance.
* modified JavaEmitter to generate struct accessor objects with better java ↵Michael Bien2009-11-111-69/+85
| | | | naming conventions.
* Add GL3bc to OpenGL composable pipelineAwayFromSunSven Gothel2009-10-181-0/+2
|
* String isEmpty() is Java 1.6 - replacedSven Gothel2009-10-131-1/+1
|
* defines with constant but more complex expressions are now no longer ignored ↵Michael Bien2009-10-083-35/+137
| | | | (e.g #define CL_FP_FMA (1 << 5)).
* gluegen.jar compiles now with source=1.5 classfile version (However, ↵Michael Bien2009-10-082-99/+103
| | | | | | gluegen-rt.jar still uses 1.4). generified classes in pcpp package and removed warnings (java 5 cleanup).
* Add <br> in commentOpenGL_3_2_ReadyMIPS_PORTSven Gothel2009-08-052-2/+2
|