summaryrefslogtreecommitdiffstats
path: root/make
Commit message (Collapse)AuthorAgeFilesLines
* JOGL GL4 preperation (cont):Sven Gothel2010-04-201-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-2031-902/+521
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
* JOGL GL4 preperation (cont):Sven Gothel2010-04-171-1/+6
| | | | | | | | | - 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 ..
* JOGL GL4 preperation:Sven Gothel2010-04-1610-3/+110
| | | | | | | | | | | | | | - 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-155-0/+166
| | | | | | | | | | | | | | | | | - 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-156-246/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-137-6/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* 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-108-17/+105
| | | | | | | | | | | | | | | | | | | | 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)
* junit: Add timeout (30s), enable offscreen testSven Gothel2010-04-091-1/+1
|
* Attach build-junit.xml to build.xml ; Add more tests Offscreen(broken on ↵Sven Gothel2010-04-092-8/+9
| | | | ATI), Drawable
* Cleanup ant files, intro: build-common.xml used for all targets; Extracting ↵Sven Gothel2010-04-097-892/+744
| | | | build-junit.xml
* Added doc/deployment:Sven Gothel2010-04-087-211/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* 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-313-5/+5
| | | | updated joglversion files.
* Merge branch 'master' of github.com:mbien/joglMichael Bien2010-03-302-7/+3
|\
| * Merge branch 'master' of github.com:mbien/joglSven Gothel2010-03-301-3/+1
| |\
| * | Adaptions toSven Gothel2010-03-301-7/+1
| | | | | | | | | | | | | | | http://www.jogamp.org/bugzilla/show_bug.cgi?id=392 7220416bcef3140883d3966d921442feae3107c4
| * | Merge branch 'master' of github.com:mbien/joglSven Gothel2010-03-299-36/+36
| |\ \
| * | | 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.
* | | renamed platform dependent BufferUtil into java file.Michael Bien2010-03-291-3/+1
| |/ |/|
* | moved com.jogamp.javafx.* to com.jogamp.*.Michael Bien2010-03-297-32/+32
| |
* | changes due to BufferFactory -> Buffers renaming in gluegen.Michael Bien2010-03-292-4/+4
|/
* final large refactoring to move to com.jogamp.*.Michael Bien2010-03-2814-77/+77
|
* Merge branch 'master' of github.com:mbien/joglSven Gothel2010-03-2837-200/+211
|\
| * refactoring part 5, (renaming com.sun.opengl->com.jogamp.opengl)Michael Bien2010-03-277-20/+20
| |
| * refactoring: renamed com.sun.opengl -> com.jogamp.opengl.Michael Bien2010-03-2739-15236/+178
| |
| * refactoring due to gluegen changes.Michael Bien2010-03-2714-8/+15077
| | | | | | | | - renamed com.sun.gluegen.runtime -> com.jogamp.gluegen.runtime.
* | Adaption for gluegen a41f4d504d2f8cf58114d570d23f757ab2659cfcSven Gothel2010-03-281-1/+1
|/
* http://www.jogamp.org/bugzilla/show_bug.cgi?id=378Sven Gothel2010-03-264-8/+10
| | | | | | | | | | | | | | Changed solution with a necessary API change of TextureData etc. Adding required GLProfile element to the factories etc, so it is clear for which GLProfile data is being created without the need of a current GLContext. TextureData/AWTTextureData: Removed the glPostInit* effort .. IMPACT: Texture util's API change - minor user code change necessary. +++
* relocated lib/gluegen.compiler.linux-32bit.xml to gluegenSven Gothel2010-03-253-33/+2
|
* modified junit.run target to write junit test results to file (->ready for ↵Michael Bien2010-03-251-6/+9
| | | | hudson).
* http://www.jogamp.org/bugzilla/show_bug.cgi?id=378Sven Gothel2010-03-255-1/+113
| | | | | | | | | | | | | | | | | Test: Added JUNIT Test Environment: - tests: jogl.test.jar - run: 'ant junit.run' Currently only runs 1 test regarding this bug id. Adding PATH (windows) or LD_LIBRARY_PATH (unix). Test initialized AWTTextureData without a current GLContext and then uses it to render .. Solution: Pending initialization of GL depending data, offered in TextureData.glPostInit(), specialized in AWTTextureData.
* Drop PointerBuffer.wrapNative2Java(..)Sven Gothel2010-03-191-1/+1
| | | | | | in favor of a simple PointerBuffer.wrap(..), due to the new semantics, ie internal integer/long presentation. Fixed the javame code in this regard.
* variable renaming in config files due to changes in gluegen.Michael Bien2010-02-032-2/+2
|
* fixed "native taglet" javadoc build configuration.Michael Bien2009-11-301-15/+19
|
* build should use gluegen.root property where possible.Michael Bien2009-11-294-20/+20
|
* refactoring: new struct accessor method naming conventions.Michael Bien2009-11-111-1/+1
|
* javadoc fixAwayFromSunSven Gothel2009-11-103-4/+14
|
* Add missing file .. sorrySven Gothel2009-10-193-0/+623
|
* Add missing file .. sorrySven Gothel2009-10-191-0/+18
|
* imageSizeInBytes .. leaving out the dirt/padding last lineSven Gothel2009-10-192-10/+9
|
* Fix JavaDoc for GL3bcSven Gothel2009-10-182-17/+30
|
* GL_NV_shader_buffer_loadSven Gothel2009-10-182-57/+154
| | | | | | GL_NV_vertex_buffer_unified_memory - Cleaned up - Added in GL2 + GL3 -> GL2GL3
* Add OpenGL 3.x compatibility profile GL3bc,Sven Gothel2009-10-188-173/+306
| | | | | | | | | | | where 'bc' is not a religious remark, but simply means 'backward compatible' :) GL3bc := GL2 + GL3, hence the interface does not define any new values or methods. Moved GL3's 3.1 part from gl3.h to gl3ext.h, so it can be included in gl3bc.c, besides gl2.h.
* New iteration of check 'imageSizeInBytes':Sven Gothel2009-10-183-47/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Premises: See http://www.glprogramming.com/red/chapter08.html "If the rectangle in memory is larger than the subrectangle that's being drawn or read, you need to specify the actual length (measured in pixels) of the larger rectangle with *ROW_LENGTH. " This equals ROW_LENGTH == SubPicture-Width + 'Dirt', ie the offset to go from one line to the next. "You also need to specify the number of rows and pixels to skip before starting to copy the data for the subrectangle. These numbers are set using the parameters *SKIP_ROWS and *SKIP_PIXELS, as shown in Figure 8-9. By default, both parameters are 0, so you start at the lower-left corner." This equals to a one time offset _before_ you start copy the data, ie with your DMA engine, using ROW_LENGTH and HEIGHT only. Compared to Mesa3D's implementation (proof): http://cgit.freedesktop.org/mesa/mesa/tree/src/glx/x11/pixelstore.c Line 78 - 200 PixelStore State Tracker: Store the values in the PixelStore structure. http://cgit.freedesktop.org/mesa/mesa/tree/src/glx/x11/pixel.c Line 82 - 155 Line 210: Start position is set one time using SKIP_* values the same way we do. Line 228: Jump to the first pixel in the newxt row, just using ROW_LENGTH Line 230: Jump to the first pixel in the next 'image' just using imageSize, rowsPerImage = IMAGE_HEIGHT>0?IMAGE_HEIGHT:height; groupsPerRow = ROW_LENGTH>0?ROW_LENGTH:width; groupSize = elementSize * components; rowSize = groupsPerRow * groupSize; imageSize = rowSize * rowsPerImage; changes: Removed redundand 'dimension' parameted, which is derived from depth and height, 1D == depth:1 height:1 2D == depth:1 height>1 nD == depth>1 height>1 Safe fail depth to >= 1 Safe fail height to >= 1D Take either the ROW_LENGTH / IMAGE_HEIGHT PixelStore value if > 0, or the given width / height.
* All tracker are aggregated in the GLContext nowSven Gothel2009-10-1713-33/+105
| | | | | | | | | | | | | | | and used within the GL*Impl. New GLStateTracker: - Tracking client/server states - Currently supports PixelStorei - Prologued in glPixelStorei and glGetIntegerv, the latter will return the tracked state if available and not call the GL method. Impacts performance and ES1 compatibility (supports ALIGNMENT). Fixed 'imageSizeInBytes' calculation: - skipPixels and skipRows is a static one time offset
* Fix WindowsOffscreenWGLDrawableSven Gothel2009-10-164-0/+25
|