summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mbien/joglMichael Bien2010-04-231-1/+6
|\
| * Add missing finally unlock, if 2nd lock failsSven Gothel2010-04-231-1/+6
| |
* | reviewed calls to lockSurface() and ensured propper unlocking.Michael Bien2010-04-235-44/+37
|/
* Merge branch 'master' of github.com:mbien/joglSven Gothel2010-04-226-207/+236
|\
| * Merge branch 'master' of github.com:mbien/joglMichael Bien2010-04-2211-177/+178
| |\
| * | reviewed X11Lib.XLock/UnlockDisplay() usage:Michael Bien2010-04-226-207/+236
| | | | | | | | | | | | | | | | | | - added lock(); try{foo();}finally{unlock();} where missing - made sure lock is called outside the try block - fixed nesting in situations with two independent locks
* | | Newt.X11:XEventsQueued: QueuedAlready doesn't work on ATI - use QueuedAfterFlushSven Gothel2010-04-221-5/+9
| |/ |/|
* | Review of using isGL2() and GL2.GL*Sven Gothel2010-04-2211-177/+178
|/
* Merge branch 'master' of github.com:mbien/joglSven Gothel2010-04-2213-0/+1399
|\
| * added jackpot 3.0 code transformator to tools/jackpotc.Michael Bien2010-04-2213-0/+1399
| | | | | | | | | | | | | | - use 'setup' for initial setup (downloads jackpot). - use 'bttf' for running a jogl1.1.1 -> jogl 2 (reloaded) transformation - tools/jackpotc/test/oldgears is a jogl 1.1.1 NetBeans project - more information about jackpot is in tools/jackpotc/lib/README after setup was run
* | Bring back GL2ES12 impl. for GL2ES1 and GL2ES2 desktop j2se and cdc. Fixing ↵Sven Gothel2010-04-2215-491/+256
| | | | | | | | profiles accordingly.
* | Migrating gl2/gl3/gl4 -> gldesktop. Use JOGL_GLDESKTOP_.. when using ↵Sven Gothel2010-04-227-105/+72
| | | | | | | | profile.jogl script
* | JNLP: Update Check Background - AlwaysSven Gothel2010-04-2215-2/+18
|/
* Add deployment scripts ..Sven Gothel2010-04-212-0/+64
|
* Fixed deployment timestamp propsSven Gothel2010-04-212-3/+2
|
* Add remark (unsigned long -> uint_32) ..Sven Gothel2010-04-212-2/+3
|
* JOGL GL4 preperation (cont):Sven Gothel2010-04-202-14/+538
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - updated lstjars.sh 32790c376583beccd030eecd7c56cbe66d380172 120kB jogl.gl2.jar (before flattening) 16kB jogl.gl2.jar (after flattening) Before: JOGL GL2 AWT 44 gluegen-rt.jar 84 nativewindow.all.jar 148 jogl.core.jar 116 jogl.util.jar 56 jogl.os.x11.jar 120 jogl.gl2.jar 64 jogl.awt.jar 4 libgluegen-rt.so.gz 144 libjogl_desktop.so.gz 8 libnativewindow_x11.so.gz 4 libnativewindow_awt.so.gz 4 libnativewindow_jvm.so.gz 796 total After: JOGL GL2 AWT 72 gluegen-rt.jar 80 nativewindow.all.jar 152 jogl.core.jar 116 jogl.util.jar 60 jogl.os.x11.jar 16 jogl.gl2.jar 64 jogl.awt.jar 4 libgluegen-rt.so.gz 120 libjogl_desktop.so.gz 8 libnativewindow_x11.so.gz 4 libnativewindow_awt.so.gz 696 total
* JOGL GL4 preperation (cont):Sven Gothel2010-04-2090-2156/+1936
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - All available OpenGL versions (native/platform) are verified at GLProfile initialization and can be queried .. A mapping of major,compat -> major,minor,options is created. - Removal of temp context creation, when creating a context. This was necessary to query general availability of ARB_create_context. Due to the shared context of X11GLXDrawableFactory and WindowsWGLDrawableFactory, this is no more necessary. Due to the version mapping, the ARB_create_context paramters are known. - NativeWindow X11Lib: Added X11ErrorHandler, throwing a RuntimeException. Necessary to catch BadMatch .. etc X11 errors, eg for glXCreateContextAttribsARB Hence all X11 calls are covered now. - X11DummyGLXDrawable needs to use an own Window, otherwise GLn n>2 fails - Flattening the desktop GL* implementation, all use GL4bcImpl, which reduces the footprint dramatically. - GL*Impl.isGL*() (desktop) utilizes the GLContext.isGL*(), hence the results reflect the actual native context version. - GLContextImpl makeCurrent/create: Added workflow documentation, clarified code, defined abstract methods to have a protocol. - Removed moved files (from here to gluegen), see gluegen a01cb3d59715a41153380f1977ec75263b762dc6 - NativeLibLoader -> <TYPE>JNILibLoader - Fixed Exception Handling (as in gluegen bce53b52c8638729750c4286dbc04cb14329fd34), ie removed empty catch Throwable .. - GLContext.setSwapInterval(): Nop in offscreen case, otherwise X11IOError (NVIDIA Bug) Test: Tests - Junit - demos.gears.Gears - demos.jrefract.JRefract Platforms - Linux 64/32 ATI/NVidia - MacOsX - Windows (virtualbox 3.1.6, offscreen failed) TODO/BUGS: - FIXME ATI GLn n>2 with AWT, can't make context current, works well on NVIDIA though - FIXME GL3GL4: Due to GL3 and GL4 implementation bugs, we still choose GL2 first, if available! - Add GL 3.3 to GL3/gl3ext.h - Add GL 4.0 to GL3/gl3ext.h and fix the GL3/GL4 seperation - Rename jogl.gl2.jar -> jogl.gldesktop.jar (as done with it's native lib already)
* code review (http://jogamp.org/bugzilla/show_bug.cgi?id=396): improved ↵Michael Bien2010-04-182-71/+86
| | | | | | exception handling in NWReflection and NativeLibLoaderBase. goal was to prevent catch(Throwable) and to fix or document empty catch blocks where it makes sense.
* DRIHack.driHackNeeded is now initialized once in the static initializer (not ↵Michael Bien2010-04-171-17/+27
| | | | in every begin() call).
* JOGL GL4 preperation (cont):Sven Gothel2010-04-177-183/+277
| | | | | | | | | - Cont. on Context creation refactoring (bb028021be2714e66d9b1062298a3e308c649c56) - Added Windows/WGL implementation - Added efficienct sharedContext usage if ARB is available, ie no more temp context has to be created. - Added more GLProfile GL4* code ..
* Fix broken Offscreen/Pbuffer query introduced in ↵Sven Gothel2010-04-169-24/+23
| | | | | | | | | | | | | | | bd4904fb04ab2168aeaf76e74385b3991429289a - Have to set the requested values in GLCapabilities if not relaxed and valid, otherwise the result is always onscreen, since the onscreen/pbuffer bits can be set for the same config. - Let GLContext implementations throw an Exception in case of no surface handle. JUnit Tests: - MiscUtils.setField -> MiscUtils.setFieldIfExists To allow _not_ throwing an exception :)
* Merge branch 'master' of github.com:mbien/joglSven Gothel2010-04-1612-147/+125
|\
| * code review: fixed empty catch blocks and a few compiler warnings in unit tests.Michael Bien2010-04-1511-144/+111
| |
| * added junit test folder to NetBeans project config.Michael Bien2010-04-151-3/+14
| |
* | JOGL GL4 preperation:Sven Gothel2010-04-1627-413/+826
|/ | | | | | | | | | | | | | - Re-Enable GL3bc native library build, works .. - Adding all the is/get GL4/GL4bc stubs .. - Adding dummy interface GL4 and GL4bc, will be removed when done - Context creation refactoring: - Move Version information to GLContext - Determine version by creation if possible (ARB_create_context), only use the unreliable GL_VERSION string if necessary. - Offering an almost platform independent ARB_create_context path: - createContextARBImpl - platform dependent GLX calls - createContextARB - platform independent setup and version loop
* JOGL (Windows):Sven Gothel2010-04-1514-85/+244
| | | | | | | | | | | | | | | | | - WindowsWGLDrawableFactory is using [singleton] shared dummy resources for - Drawable and Context which are utilized in case they are needed .. They are removed at shutdown call - GLCapabilities - Set pbuffer as the HW capabilities show, hence onscreen && pbuffer is valid - DefaultGLCapabilitiesChooser: Respect PBuffer selection (fixed) Only skip a config, if request is !onscreen && pbuffer, but pbuffer n/a Tests: - JUnit Passed (Windows32: Chromium - Except PBuffer (n/a)
* Further ATI (fglrx) X11Display bug workaround/cleanupSven Gothel2010-04-1528-508/+1369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - See https://bugzilla.mozilla.org/show_bug.cgi?id=486277 - Calling XCloseDisplay occasionally leads to a SIGSEGV, even thought the reference is valid and OK. Workaround is not to close any X11Display, but to hold them stashed and reuse them. Since we already pipeline all X11Display's via Nativewindow's X11Util, an added referenceCounter and a global active/passive list solved this problem. This workaround is only active in case 'isVendorATI()'. NEWT/NativeWindow X11: - Let XIOErrorHandler and invalid display references fail hard with FatalError, otherwise we won't see the stack trace - and those bugs are indeed fatal. NativeWindow X11: - Install XIOErrorHandler, which stays active. - X11Util.X11Display: - Add reference counter - Add global active/passive list. Passive if reference count == 0 and marked as 'un-closeable' (-> ATI). Reusing passive members when create a new display. - JOGL: - Use DeleteLocalRef() calls to free temp NIO buffer in manual *Copied implementation. - GLDrawableFactoryImpl: Be serious about the shutdown() semantics - *GraphicsConfiguration: - Fix the invalid Onscreen/PBuffer/Pixmap determination (X11/EGL/WGL) - Just return null if not valid - X11GLXGraphicsConfigurationFactory - FBConfig - Determine recommendedIndex properly .. - Don't bail out if a FBConfig is invalid .. - Use Chooser in case nothing is recommended .. - X11OffscreenGLXDrawable fixes bugs: - wrong (int) cast of parent window in XCreatePixmap call - setting display to zero too early in destruction, ie before XCloseDisplay - X11GLXDrawableFactory is using [singleton] shared dummy resources for - Screen, Drawable and Context which are utilized in case they are needed .. They are removed at shutdown call - GLXVersion gathering in GLXUtil now .. - DefaultGLCapabilitiesChooser: Respect PBuffer selection Tests: - Add DrawableFactory shutdown() - Add various Offscreen Capabilties - Add Offscreen and non-pbuffer case - JUnit Passed (Linux64bit: NVidia/ATI) - demos.jrefract.JRefract passed (Linux64bit: NVidia/ATI)
* ATI (fglrx) PBuffer/X11Display bug workaround/cleanupSven Gothel2010-04-1326-130/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - See https://bugzilla.mozilla.org/show_bug.cgi?id=486277 - Description: - To use PBuffer, a context must be current - X11Display cannot be switched while using the PBuffer [within one thread]. Hence we shall try harder to reuse _the_ user configured X11Display - whenever possible. This is actually a good thing, ie cleanup up our code again. - Changes to workaround/cleanup: - GLDrawableFactory* methods 'canCreate*()' are changed to 'canCreate*(AbstractGraphicsDevice)' to allow pipelining the X11Display. This reduces the overhead of using a local TLS X11Display. - WindowsDummyWGLDrawable cstr gets the GLProfile as a parameter now, this is done while adding X11DummyGLXDrawable - forseeing the usecase to query available GLProfiles at startup. - X11DummyGLXDrawable added, following the WindowsDummyWGLDrawable path to have a dummy GLContext current to fix the ATI bug. NativeWindow X11: - Add XIOErrorHandler to identify the fatal failure of closing a Display (-> ATI bug). Build: - Adding ant.jar and ant-junit.jar to the junit compile/run classpath - Misc: - Fix: CreateDummyWindow(..) returns a HWND, not a HDC - mapToRealGLFunctionName: Added mapping for X11/GLX. - X11GLXGraphicsConfigurationFactory: Uncommented dead code 'createDefaultGraphicsConfigurationFBConfig' Tests: Passed (Linux64bit: NVidia/ATI) Todo: More tests on ATI, especially multithreading/X11Display usage.
* NEWT X11 Fix (mainly ATI and multithreading)Sven Gothel2010-04-138-163/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | - EventDispatchThread -> EDTUtil Since the name leads to the assumptions that an instance is the EDT. EDTUtil manages the EDT within. - EDTUtil, no more reference to Display, but use a Runnable for the pumpMessage() - Window.destroy() check if already done - X11Window: Added XErrorHandler to catch BadWindow and BadAtom while dispatching events - it is possible that the resource is already freed. Also added an XIOErrorHandler to identify the fatal Display* inaccessibility. Tests: - New junit/com/jogamp/test/junit/newt/TestWindows01NEWT.java Testing creation/destruction and double destruction (error case) - Fix: src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java Properly holding all NEWT references .. Misc: - Reduced redundant NEWT 'toString()' output (*Capabilities, ..) -
* Fix: Use file.seperator (win32); Use java.home/bin/javaSven Gothel2010-04-101-3/+3
|
* ant 1.8.0 on win32Sven Gothel2010-04-102-3/+3
|
* *** Now Using Apache-Ant-1.8.0 ***Sven Gothel2010-04-1014-67/+206
| | | | | | | | | | | | | | | | | | | | Cleanup: - Adding Javac includeAntRuntime argument (false whenever possible) - Clear junit results folder before testing - <ant ..> tasks, use inheritRefs="true" inheritAll="true" whenever possible for better performance and consistency (no duplicate property names). The JOGL build -> build-<component> tree is clean in this respect. junit.run: Test*NEWT* Emulation of junit task, due to the fact that we have to place invoke our MainThread class first (-> MacOSX). Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties). Fixed NEWT tests: - No more println .. using Assertions .. - Offscreen produces 2 files correctly (Linux/NVidia, OSX/NVidia, Win32/Emulation)
* Fix NEWT Window destroy/close race condition,Sven Gothel2010-04-094-57/+94
| | | | | | | | where a programatic window.destroy() call from thread 1 triggers a destroy() call via the native windowing toolkit via windowDestroyNotify(). It has to be checked/locked if a destroy is in progress, otherwise they could deadlock (OSX and Win32).
* junit: Add timeout (30s), enable offscreen testSven Gothel2010-04-093-7/+30
|
* Attach build-junit.xml to build.xml ; Add more tests Offscreen(broken on ↵Sven Gothel2010-04-0914-12/+1451
| | | | ATI), Drawable
* Fix missing MacOsX Newt refactoringSven Gothel2010-04-091-30/+30
|
* Added FIXME comment: DBLBUFOFFSCRN, to tag the impl of forcing single buffer ↵Sven Gothel2010-04-094-8/+8
| | | | on offscreen/pbuffer
* Cleanup ant files, intro: build-common.xml used for all targets; Extracting ↵Sven Gothel2010-04-099-895/+747
| | | | build-junit.xml
* Added doc/deployment:Sven Gothel2010-04-0814-224/+922
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JOGL-JAR-BUNDELING.txt A first FAQ about the (new) JAR partitioning. lstjars/lstjars.linux_amd64-20100406.log A first deployment payload measurement in kBytes :) New JAR Partitioning: All-In-One (*all*): - with AWT - without AWT See JOGL-JAR-BUNDELING.txt Atomic: See JOGL-JAR-BUNDELING.txt - Removed property setup.noall, since the *all* targets are mandatory now. Currently - Added gl4 part (still empty) - Fixed make/lstjars.sh and etc/profile.jogl (new JAR bundles) - Fixed make/lstjars.sh to produce JAR and PACK200 numbers, and using the *all* bundles if possible. MacOsX: - Fix missing refactoring in src/newt/native/MacWindow.m - Adding missing NSWindowDelegate protocol to NewtMacWindow as mandatory since 10.3.6 Misc: - Applied: 'gluegen.cpptasks.striplibs' to all native libraries. - Use path.seperator (ant) and system.env.library.path (gluegen), for junit runs.
* added intelliJ modules for jogl, newt and nativewindow. Removed other ↵Michael Bien2010-04-0813-248/+52
| | | | projectfiles.
* removed duplicated imports in config files due to changes in gluegen.Michael Bien2010-04-084-7/+0
|
* modifications due to class movement in gluegen.Michael Bien2010-03-3132-61/+30
| | | | updated joglversion files.
* Merge branch 'master' of github.com:mbien/joglMichael Bien2010-03-3011-60/+61
|\
| * Merge branch 'master' of github.com:mbien/joglSven Gothel2010-03-3029-1148/+340
| |\
| * | Adaptions toSven Gothel2010-03-3010-60/+59
| | | | | | | | | | | | | | | http://www.jogamp.org/bugzilla/show_bug.cgi?id=392 7220416bcef3140883d3966d921442feae3107c4
| * | Merge branch 'master' of github.com:mbien/joglSven Gothel2010-03-2971-350/+343
| |\ \
| * | | Add uint32_tSven Gothel2010-03-291-0/+2
| | | |
* | | | fixed bug where gl3 impl package was placed in jogl.gl2.x11.jar.Michael Bien2010-03-291-4/+31
| |_|/ |/| | | | | | | | build creates now jogl.gl3.<os>.jar for each os.
* | | fixed a bunch of javadoc warnings.Michael Bien2010-03-2915-76/+77
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 05:56:54 +0000