summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:sgothel/joglSven Gothel2012-03-101-0/+1
|\
| * Merge pull request #46 from xranby/masterSven Gothel2012-03-091-0/+1
| |\ | | | | | | Update make.jogl.all.linux-armv7.sh script: Set TARGET_PLATFORM_ROOT=/
| | * Update make.jogl.all.linux-armv7.sh script: Set TARGET_PLATFORM_ROOT=/Xerxes Rånby2012-03-081-0/+1
| |/
* | AndroidWindow: Fix Native PixelFormat == VisualID { <0 case, TRANSLUCENCY, ↵Sven Gothel2012-03-101-73/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..} ; Generate focus event/state; onTouch() consumed - fix Native PixelFormat == VisualID { <0 case, TRANSLUCENCY, ..} - surfaceChanged(..): use 'ANativeWindow_getFormat(surfaceHandle)' if given format is generic (<0) - match used caps w/ format exactly - generate focus event/state: always focus at creation and listen to onFocusChange() - onTouch() consumed only if we mapped a NEWT event, otherwise return false. - use VisualIDHolder of already chosen config to determine native VisualID - use Log.d(MD.TAG, ..)
* | Enable Android remote adb unit tests (1 Test currently / WIP)Sven Gothel2012-03-105-65/+79
| | | | | | | | | | | | - BOOTCLASSPATH - see gluegen commit 227ad20f6bf10d5d28073dfbd3fac363e3a09531 - Move jogl.test.apk creation in build-test.xml - Enable and fix 'junit.run.remote.adb' target
* | GL/GLContext: Properly define swapInterval incl. default value for EGL (1) ↵Sven Gothel2012-03-107-28/+69
| | | | | | | | | | | | and desktop (undefined). *GLContext.setSwapIntervalImpl: Simple return success, set state in GLContext.
* | Minor changes: DefaultGLCapabilitiesChooser + GearsES1/2 and Android demosSven Gothel2012-03-1012-63/+81
| | | | | | | | | | | | | | | | | | | | DefaultGLCapabilitiesChooser: Move 'static' values to final static. GearsES1/2: Handle width>=height case -> flip frustum. Android: Enable fps trace dump after visibility, use default RGBA_8888, Explicitly don't use swapInterval (-1). NEWTGearsES2TransActivity: Gather Screen size and set demo view 2/3 of it.
* | NEWT/setFullscreen(v): Save new state for to-be-created windows (not yet valid).Sven Gothel2012-03-101-11/+12
| |
* | ShaderState: Use a HashMap instead of a HashSet for enabled attribute ↵Sven Gothel2012-03-101-17/+19
| | | | | | | | states, reducing fluctuating memory.
* | Stabilize open InputStream's / Closeable's: Decorate w/ try-finally and ↵Sven Gothel2012-03-101-30/+39
|/ | | | | | close within the latter See gluegen commit 24f8694a188b4a5255d4ac4f8b49982bd8ad3228
* AndroidWindow.surfaceChanged(.., int pFormat, ..): Use passed pixel-format ↵Sven Gothel2012-03-071-4/+8
| | | | | | | if valid Turns out on Android 4.0.3 / Pandaboard ES (at least), the NDK method 'ANativeWindow_getFormat()' returns '1'.
* GLContextImpl: Expose GL_RENDERER for impl. / EGLContext workaround Android ↵Sven Gothel2012-03-072-24/+47
| | | | | | | | | | 4.0.3, Pandaboard ES, PowerVR SGX 540 Bug GLContextImpl: Expose GL_RENDERER for impl. - This allows reusing the 'early' string. EGLContext workaround Android 4.0.3, Pandaboard ES, PowerVR SGX 540 Bug - On mentioned platform, the app crashes when eglSwapInterval() has been called.
* Update android armv7 cross build/test scriptSven Gothel2012-03-071-26/+40
|
* Merge branch 'pulled'Sven Gothel2012-03-077-56/+23
|\
| * Merge remote-tracking branch 'remotes/revane/master' into pulledSven Gothel2012-02-297-56/+23
| |\
| | * Get JOGL to build with NDK r7Edwin Vane2012-02-287-56/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Most of the android build work is done by gluegen ant files. Changes made to gluegen in support of NDK r7 need to be reflected here: - New/fewer environment variables. - Specifying android.abi for packaging. - Cross-compilation script cleaned up to look like gluegen's cross compile script for consistency. - Renamed install/re-install adb helper scripts to be ARM specific.
* | | NativeWindowFactory: Get and hold singleton JAWT ToolkitLock (efficiency); ↵Sven Gothel2012-03-061-28/+34
| | | | | | | | | | | | Correct classname AWTGraphicsDevice (NW reorg).
* | | NativeSurface.lockSurface(): Update API doc (+ emphasize ↵Sven Gothel2012-03-062-13/+39
| | | | | | | | | | | | LOCK_SURFACE_CHANGED); ProxySurface.lockSurface() +LOCK_SURFACE_CHANGED
* | | NativeWindow public* reorg 3/3 ; NativeVisualID -> VisualIDHolder incl. ↵Sven Gothel2012-03-0620-250/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper utilization. - VisualIDHolder: Update documentation (Exception case, etc) - NativeVisualID -> VisualIDHolder (public) - incl. generic Comparator - better doc and enum values - VID_UNDEFINED == 0 - methods shall not throw exception, but return UNDEFINED - CapabilitiesImmutable extends VisualIDHolder - All Capabilties impl. - use VID_UNDEFINED for undef. value - use final private (immutable) fields - AbstractGraphicsConfiguration extends VisualIDHolder - X11 CreateDummyWindow takes (int) visualID
* | | NativeWindow public-spec to public-impl reorg ↵Sven Gothel2012-03-0662-148/+209
| | | | | | | | | | | | (javax.media.nativewindow.<impl> -> com.jogamp.nativewindow.<impl>) 2/3
* | | NativeWindow public-spec to public-impl reorg ↵Sven Gothel2012-03-0616-54/+0
| | | | | | | | | | | | (javax.media.nativewindow.<impl> -> com.jogamp.nativewindow.<impl>) 1/2
* | | remote unit test reorg (all, awt, newt)Sven Gothel2012-03-053-7/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | junit.run.remote.ssh -> junit.run.remote.ssh.all added junit.run.remote.ssh.newt added junit.run.remote.ssh.awt junit.run.tests issues 'junit.run.remote.ssh.newt' only for now. manual remote ssh unit test invocation: bash scripts/make.jogl.all.linux-armv7-cross.sh -f build-test.xml junit.manual.run.remote.ssh.newt bash scripts/make.jogl.all.linux-armv7-cross.sh -f build-test.xml junit.manual.run.remote.ssh.awt bash scripts/make.jogl.all.linux-armv7-cross.sh -f build-test.xml junit.manual.run.remote.ssh.all
* | | X11 Fix NativeVisualID regression (commit ↵Sven Gothel2012-03-057-37/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90c46b1ef1f199ceb63e85c85e9ebeb919d49c4a) ; Using plain X11 Capabilities In case X11GLXGraphicsConfigurationFactory and hence X11GLCapabilities (glx) is not being used, the X11GraphicsConfigurationFactory used plain Capabilities object for the chosen caps. The latter is not derived from NativeVisualID. - Added X11Capabilities supporting NativeVisualID to fit our needs. - X11Capabilities.XVisualIDComparator uses NativeVisualID.NVIDType.X11_XVisualID - *Capabilities have better unique names in toString()
* | | linux-armv7-cross script: Introduce TARGET_PLATFORM_ROOTSven Gothel2012-03-051-1/+2
| | |
* | | Test*ES2Newt: Add shutdown w/ type to internal loop testSven Gothel2012-03-053-6/+37
| | |
* | | Fix GLWindow/SWT-GLCanvas: set context synchronized ; Misc ChangesSven Gothel2012-03-055-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GLWindow/SWT-GLCanvas: set context synchronized - GLWindow fix commit a0177c8a1048683e5d43f4712f8f9e37091d4e85. Removed explicit recursive surface lock requires recursive context locking, otherwise concurrent rendering fails. The implicit recursive surface lock within context makeCurrent() is applied after the context lock itself. Misc Changes - Fix TestPBufferDeadlockAWT, which was not using the unique profile string reference
* | | Complete LOCK_SURFACE_CHANGED ; Introduce NativeVisualID (Daisy chaining ↵Sven Gothel2012-03-0537-322/+613
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *GraphicsConfiguration) ; ... NativeVisualID: New interface for Capabilities implementations, allowing retrieval of the native 'visual id'. Impl. by WGL, X11 and EGL. JAWTWindow.lockSurface() - Detect surfaceHandle change an return LOCK_SURFACE_CHANGED (see: LOCK_SURFACE_CHANGED) EGLDrawable: - Impl. updateHandle() (see: LOCK_SURFACE_CHANGED) - use NativeVisualID for EGLGraphicsConfiguration selection to respect a native 'visual id' EGLContext.createContextImpl: Use NIO for attributes EGLDisplayUtil: Enhance eglGetDisplay w/ DEBUG code and NativeSurface / EGL_DEFAULT_DISPLAY variation EGL, XGL, WGL GraphicsConfiguration: - Don't set ALPHA_SIZE and STENCIL_SIZE if not requested in attribute list for context creation. - toString() shows proper identification, eg.: egl, x11, win32 .. EGLGraphicsConfigurationFactory: Daisy chain GraphicsConfigurationFactory for native device type (currently only X11). This allows choosing the EGLGraphicsConfiguration and hence native visual id based on EGL when invoked via the factory model (generic). In case EGLGraphicsConfigurationFactory is not suitable or doesn't produce a native visual id, it falls back the the original one. X11AWTGraphicsConfigurationFactory and X11Window: Use generic NativeVisualID which allows EGLGraphicsConfiguration implicit. *GraphicsConfiguration's DEBUG flag is pushed up to DefaultGraphicsConfiguration LOCK_SURFACE_CHANGED: - commit 006e9fe402a0a47b45fd2c4af51296aef895e8b5 - commit a0177c8a1048683e5d43f4712f8f9e37091d4e85 Impact: - Fixes EGL/GLES (wrapper/native) usage on X11, proper Xvisual selection w/ EGL - Fixes EGL/GLES (wrapper/native) usage on Windows, ANGLE works w/ NEWT and forced ES2
* | | Fix GLArrayDataServer.destroy(GL): vboName was cleared by super class before ↵Sven Gothel2012-03-051-3/+6
| | | | | | | | | | | | deletion
* | | NEWT/Windows lockSurfaceImpl(): Detect hdc change and result w/ ↵Sven Gothel2012-03-041-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | LOCK_SURFACE_CHANGED This allows an underlying delegation/mapping to update the handles, eg.: EGLDrawable. See commit a0177c8a1048683e5d43f4712f8f9e37091d4e85
* | | NewtFactory: Since the platform string references are unique, let's just ↵Sven Gothel2012-03-044-20/+18
| | | | | | | | | | | | compare the references instead of a string compare
* | | NEWT/GLWindow.display(): No explicit surface locking/unlocking for ↵Sven Gothel2012-03-044-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLDrawableHelper.invokeGL(..) - it's done implicit at makeCurrent()/release() The explicit locking takes away the locking result, eg. SURFACE_CHANGED, which is required to update the delegated drawable handles (e.g.: EGL surface handle). With the followup fix of EGLDrawable.updateHandle()'s recreate EGL surface, an EGL 'wrapper' can work on Windows (eg. ANGLE).
* | | Add es2readsquare, reassembling JOGL's RedSquareES2 demoSven Gothel2012-03-046-4/+636
| | |
* | | Add native es2gears test (mesa-demos, eglut enhanced w/ programmatic lifecycle)Sven Gothel2012-02-2912-0/+2654
| | |
* | | TestGearsES2NEWT: Remove redundant GLES2 testSven Gothel2012-02-291-11/+0
|/ /
* | CrossTest: Add AWT Unit-Test. Unit-Tests: Refine GLProfile request where we ↵Sven Gothel2012-02-2927-114/+205
| | | | | | | | favor a more detailed request than getDefault().
* | Software Rasterizer: Add 'Mesa X11' to GL_RENDERER list. EGLDrawable: Remove ↵Sven Gothel2012-02-292-9/+11
| | | | | | | | | | | | | | | | | | getWidth()/getHeight() EGL surface queries. EGLDrawable: Remove getWidth()/getHeight() EGL surface queries. This code is not only redunant, since the surface dimension is known in the NativeWindow surface returned by GLDrawableImpl., but also causes an exception since the EGL surface might not be realized at the time it's dimension is being queried.
* | Add / Use gluegen.basename prop. for remote ssh testSven Gothel2012-02-281-1/+3
|/
* NativeWindow: Relax Xinerama dependency / Rename Windows impl subfolder to ↵Sven Gothel2012-02-2713-113/+201
| | | | | | | common name win32 (same as stub_include) Utilizing dlopen/dlsym in an efficient way relaxes the platform requirement of having Xinerama available. This allows using Nokia N9 MeeGo out of the box.
* ScreenMode/X11: Use common defaults in case of undefined values. X11: ↵Sven Gothel2012-02-272-9/+17
| | | | Tolerate invalid refresh rate and use default.
* Fix minor test issuesSven Gothel2012-02-273-33/+11
|
* NEWT Screen.getCurrentScreenModeIntern() !ScreenMode case: Attempt to get ↵Sven Gothel2012-02-262-3/+7
| | | | screen size if 0.
* Fix TestGearsGLJPanelAWTBug450 (regression of commit ↵Sven Gothel2012-02-261-1/+1
| | | | 397665ff472d83809a028e4f4a5d332294617623)
* GLContext.isCurrentContextHardwareRasterizer(): Recognize 'softpipe' ↵Sven Gothel2012-02-262-5/+20
| | | | (Gallium) as software rasterizer. Check for NULL and issue warnings (TRIAGE THIS).
* UITestCase: Gracely ignore unsupported tests (ES2) ; Ignore all ↵Sven Gothel2012-02-2520-46/+238
| | | | Shared-Context and more 'known' test cases for ES.
* Include GraphicsConfigurationFactory in lifecycle (initSingleton/shutdown) - ↵Sven Gothel2012-02-254-28/+67
| | | | | | fixes recursion on fallback GraphicsConfigurationFactory .. also validate the X11 GraphicsConfigurationFactory in X11GLXGraphicsConfigurationFactory and fail fast
* X11: Fix unavailable GLX (Server): Use fallback GraphicsConfigurationFactory ↵Sven Gothel2012-02-254-21/+35
| | | | | | | | | | | (X11GLX -> X11) - GraphicsConfigurationFactory.registerFactory(..) returns previous mapped GraphicsConfigurationFactory. This allows daisy chaining of GraphicsConfigurationFactory, in case one is not suitable. - X11GLXGraphicsConfigurationFactory: - Store the previously mapped factory as fallback - choose*Impl(): If GLX is not available, use fallback
* Cleanup DEBUG flags of *GraphicsConfigurationFactory (Use the common ↵Sven Gothel2012-02-254-7/+0
| | | | 'nativewindow.debug.GraphicsConfiguration')
* X11/GLX: Query X Server whether GLX is available (X11/SharedResourceRunner) ↵Sven Gothel2012-02-255-26/+36
| | | | | | | | | | | | ; Minor cleanups. Before gathering GLX details and actually instantiate a X11/GLX shared resource, we shall query whether GLX is actually available. Since GLX availability is being queried on the server side, more changes are required for the X11GLX* impl, eg. not using X11GLXGraphicsConfigurationFactory and fall back to X11GraphicsConfigurationFactory.
* Fix commit 9e66972c193399d6dcdf9e6662f4335bdf15736aSven Gothel2012-02-251-1/+1
|
* enhancement: NWJNILibLoader.loadNativeWindow(..) returns true/false if ↵Sven Gothel2012-02-255-10/+17
| | | | loading was successful. Negative result causes proper exception in caller.