Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | JOGL refactoring: | Sven Gothel | 2009-03-16 | 449 | -94476/+748 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored JOGL into 3 independent components. 1 NWI - Native windowing interface Abstracts the the general NativeWindow interface and it's factory, incl the basic JAWT and Xlib toolkit. The latter was motivated to clean up the JOGL workspace, and to allow other to reuse this part. The generic core is nwi.core.jar, the AWT add-on is nwi.awt.jar. 2 JOGL - The OpenGL mapping Further cleanup of the SPEC. All non OpenGL toolkits are relocated to NWI and NEWT. There is still openmax and the windows audio layer .. Another cleanup of the fixed function pipeline emulation. Moved utilities and implementations where they belong .. Removed GLUnsupportedException. Misc .. changes 3 NEWT - The new windowing toolkit The generic NEWT, newt.core.jar. The JOGL and AWT modules are seperate, newt.ogl.jar newt.awt.jar. Their build can be switched off. The modules source and builds resides in their own directory. Because of their nature, they share the stub_includes, etc. Each module has it's own ant build script - build-nwi.xml - build-jogl.xml - build-newt.xml They can be build at once using build.xml as ususal, which just invokes the seperate build tasks. if rootrel.build=build, then the build location is jogl/build-nwi jogl/build-jogl jogl/build-newt and the sources are under jogl/src/nwi jogl/src/jogl jogl/src/newt Tested: jogl-demos, d4; Linux, MacOsX; Nvidia git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1868 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | NEWT window closing: | Sven Gothel | 2009-03-14 | 45 | -172/+648 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY and WindowListener.windowDestroyNotify() method. - Removed windowClosed() method for JNI hook - Added windowDestroyNotify() windowDestroyed(), where windowDestroyNotify() shall be called by the native implementation _before_ the window gets shutdown. The Window.java then sends a WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY event, and either Window.java or it's owner GLWindow.java issues the destroy() procedure. - Added GLEventListener.dispose(GLAutoDrawable), to allow user application to release GL ressources. Issued by GLWindow (-> see windowDestroyNotify()) - X11 impl intercepts WM_DELETE_WINDOW, using Atom, MacosX impl already uses the _before_ method (VERIFY), and Windows impl uses the WM_CLOSE event (VERIFY). JOGL2 dispose/destroy .. - Added GLEventListener.dispose() to GLCanvas and GLJpanel - GL* toString() rearrangement, assumes it is issued by GLContext(), which indeed is the core information node. - Added proper destroy() methods and calls, to achieve a proper resource release at destruction. Instrumentizing almost all classes with a destroy() method, so no release function lookup is necessary. - misc changes .. JOGL2 Demos - Fixed in regards to the above changes git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1867 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Worked around problem on Mac OS X where right mouse button down events | Kenneth Russel | 2009-03-13 | 1 | -1/+24 |
| | | | | | | | were not being received by Newt window git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1866 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | javadoc update (2) | Sven Gothel | 2009-03-13 | 1 | -1/+1 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1865 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | javadoc update | Sven Gothel | 2009-03-13 | 2 | -5/+5 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1864 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | New package Native Window Interface 'java.media.nwi', | Sven Gothel | 2009-03-13 | 72 | -347/+411 |
| | | | | | | | to loose JOGL dependencies for the moved interfaces, mainly NativeWindow. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1863 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fix NEWT X11 Keymapping | Sven Gothel | 2009-03-13 | 6 | -4/+259 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1862 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed problem with conversion of key code for enter key on Mac OS X; | Kenneth Russel | 2009-03-08 | 1 | -0/+5 |
| | | | | | | | similar problems may exist on other platforms git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1858 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Unified some double GL enums (register combiner), .. | Sven Gothel | 2009-03-06 | 2 | -27/+28 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1857 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | - Fixed rootrel.build usage, this works properly through gluegen, jogl-demos ↵ | Sven Gothel | 2009-03-05 | 69 | -1303/+1939 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and this build. You can say -Drootrel.build=build-x86_64 for example. - Fixed jogl-demos in regard to this changeset - Gluegen - Fixed gluegen BuildComposablePipeline's 'getGL*' methods. Now they return 'this', otherwise the pipeline would be broken/removed. - Add BuildComposablePipeline CustomPipeline, which allows customized class composition with an interface (to be wrapped), prolog class and the downstream class. - Add GlueGen (incl. ant task) 'outputRootDir' to be able to set a top output root dir via ant / commandline. - GL fixed function - Package 'javax.media.opengl.sub.fixed.*' defines some fixed function interfaces. This allows partitioning of custom implementation. - Using gluegen's new CustomPipeline to compose a GLFixedFuncIf implementation, using a GL downstream and a GLFixedFuncHookIf prolog. The latter implements the fixed functionality. Example is the GLFixedFuncImpl. gl.getContext().setGL( new GLFixedFuncImpl(gl, new FixedFuncHook(gl.getGL2ES2())) ) ; or gl.getContext().setGL( new GLFixedFuncImpl(gl, gl.getGL2ES1()) ) ; - The example GLFixedFuncHookIf impl FixedFuncPipeline/ can be instantiated with custom shader code. - ES2 and all other interfaces only contain the original functionality, besides minor convenient data access methods. - Fix: GL2ES2 createCompileShader() and createLoadShader() is moved to ShaderCode util class. - Updated PMVMatrix - Add: GLAutoDrawable.setContext() .. and all it's implementations Necessary to set a new GLContext. - Add: GLContext getAttachedObject(int) and putAttachedObject(int, Object), to allow the user to attach application specific and TLS sensitive objects to the GLContext. - git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1856 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | increase double click interval | Christopher Oliver | 2009-01-15 | 1 | -1/+1 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1848 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Changed how MacWindow computes the coordinates for mouse events sent | Kenneth Russel | 2009-01-15 | 1 | -1/+7 |
| | | | | | | | | up to Java to improve the behavior where drag events are used to drag the window around; behavior is better but still not perfect git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1847 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed known bug in coordinates passed for WINDOW_MOVED events on Mac | Kenneth Russel | 2009-01-14 | 2 | -38/+12 |
| | | | | | | | | OS X. Fixed residual bug in handling of setPosition calls. Tested manually by moving around window of Angeles demo. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1846 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Turned off debugging printfs | Kenneth Russel | 2009-01-14 | 1 | -2/+7 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1845 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed ArgumentIsString directive for glProgramStringARB (now | Kenneth Russel | 2009-01-12 | 2 | -0/+2 |
| | | | | | | | | | | glProgramString) and updated demos. Added FIXME to gl-ignore-gl2_es12-special.cfg about definitions that it seems should be in the GL interface (such as the GL_ARB_imaging definitions) as they are replicated in the GL2ES1 and GL2ES2 interfaces. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1844 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | pass original unconverted keyChar | Christopher Oliver | 2009-01-09 | 1 | -2/+2 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1843 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | implement setTitle | Christopher Oliver | 2009-01-08 | 1 | -0/+7 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1842 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Added GLCapabilities.setBackgroundOpaque() and isBackgroundOpaque() | Kenneth Russel | 2009-01-06 | 4 | -0/+47 |
| | | | | | | | | | | for shaped window support on Mac OS X, and modified MacOSXCGLContext to pay attention to this bit. Changed Mac OS X port of Newt to make window non-opaque if borderless, and still allow it to receive the keyboard focus. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1841 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Deleted broken attempt at transparent window code from AWTWindow. | Kenneth Russel | 2009-01-06 | 1 | -26/+2 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1840 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed problems exposed by SoyLatte JRE where there was no | Kenneth Russel | 2009-01-06 | 1 | -1/+16 |
| | | | | | | | NSAutoreleasePool present. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1839 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Native (non-AWT) port of Newt to Mac OS X using Cocoa. Most | Kenneth Russel | 2009-01-05 | 12 | -61/+1364 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality (mouse click, mouse motion, mouse dragging, keyboard events) appears to be working. Currently works with the Apple JRE and requires the JVM command-line arguments -XstartOnFirstThread and -Djava.awt.headless=true . Will work with the standalone SoyLatte JRE pending additional launcher changes. Tested with Angeles demo and various JavaFX demos. Added -Dnewt.ws.name=AWT option to force the use of the AWT port of Newt on any supported platform. Known bugs: - While resizing a window or dropping down a menu, the application will hang. This is due to how the event processing is currently done in Newt (via Window.dispatchMessages()) and how Mac OS X deals with resize operations (by pushing a nested event loop into which we have no visibility). There are at least a couple of solutions. One would be to preserve the current API semantics but use a Newt Launcher class to move main() on to a different thread, saving the primordial thread for [NSApplication run]. Another would be to move Newt (and, by association, the JavaFX runtime code) to a callback model like GLUT. - Command-Q and the Quit menu option do not yet properly exit the application. - The coordinates for the WINDOW_MOVED event are wrong. Added the rest of the VK_ constants to the KeyEvent class. Made preliminary changes to support the SoyLatte JRE. Worked around initialization order issues with Fmod. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1838 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Moved javax.media.opengl.glsl.* and javax.media.opengl.sdk.* classes | Kenneth Russel | 2009-01-03 | 9 | -11/+9 |
| | | | | | | | | | into com.sun.opengl.util.* hierarchy in preparation for refactoring of fixed function emulation into utility classes. Updated dependencies and demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1837 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Moved FileUtil and StreamUtil classes back into com.sun.opengl.util | Kenneth Russel | 2008-12-30 | 10 | -90/+88 |
| | | | | | | | | | package. Moved TGAWriter back into com.sun.opengl.util package to prevent creating a new package for a single class. Updated implementation and demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1836 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Refactored AWT dependencies in Animator class differently to allow | Kenneth Russel | 2008-12-30 | 7 | -423/+440 |
| | | | | | | | | | | | both Animator and FPSAnimator to pick up AWT behavior when available. Moved Animator and FPSAnimator back to com.sun.opengl.util package as it is unclear whether these classes are useful enough on all platforms and profiles to warrant inclusion in the public specification. Updated demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1835 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Cleaned up java.part.util.gl2 definition after movement of GLUT classes. | Kenneth Russel | 2008-12-30 | 1 | -1/+1 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1834 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Moved GLUT into com.sun.opengl.util.gl2 package and renamed to JOGL | Kenneth Russel | 2008-12-30 | 16 | -53/+32 |
| | | | | | | | | | 1.0 naming convention. Moved associated font classes into same package and made them package-private again to reduce the number of classes in the public API. Updated demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1833 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Added file missed in last checkin | Kenneth Russel | 2008-12-30 | 1 | -0/+601 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1832 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Renamed TileRenderer back to JOGL 1.0 naming convention. Updated demos. | Kenneth Russel | 2008-12-30 | 1 | -601/+0 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1831 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Moved GL2- and AWT-specific utility classes into the AWT package | Kenneth Russel | 2008-12-30 | 4 | -56/+47 |
| | | | | | | | | | because the expectation is that the AWT implementation will only be used on the desktop, where the GL2 profile is always available, and renamed the classes to their JOGL 1.0 naming convention. Updated demos. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1830 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Removed JOGLAppletLauncher, superseded by JNLPAppletLauncher at | Kenneth Russel | 2008-12-30 | 1 | -1080/+0 |
| | | | | | | | http://applet-launcher.dev.java.net/ git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1829 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | After more thought, realized once again that because most Java window | Kenneth Russel | 2008-12-29 | 12 | -84/+75 |
| | | | | | | | | | | | | | | | | | toolkits create persistent Java heap objects corresponding to components that might be realized and unrealized multiple times, the programming model of JOGL implies that GLDrawables must be persistent with regard to the components for which they are created, and that the setRealized(true/false) hook must be the indicator that any OpenGL resources associated with that window are to be created or destroyed. Removed GLDrawable.destroy(); it is now once again only present for GLPbuffer. Fixed up various on-screen and off-screen GLDrawable implementations. Refactored EGLDrawable implementation to trigger on setRealized(true/false); these changes have been compiled but not tested. Clarified documentation of GLDrawable.setRealized. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1828 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Removed notion of wrapped windows from the NativeWindow interface, | Kenneth Russel | 2008-12-23 | 10 | -71/+24 |
| | | | | | | | | leaving such handling up to toolkits such as Newt. Updated NativeWindow documentation. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1827 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Removed lockSurface(), unlockSurface(), and isSurfaceLocked() from | Kenneth Russel | 2008-12-21 | 4 | -37/+0 |
| | | | | | | | | | GLDrawable interface because they are implementation details that should not be in the public API. Removed associated calls from GLCanvas, GLJPanel and Newt GLWindow. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1826 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed more bugs in glue code generation related to using opaque long | Kenneth Russel | 2008-12-20 | 3 | -3/+10 |
| | | | | | | | | | | | type for pointers returned in arrays: specifically, the return value of glXChooseFBConfig. However, this fix contains an inherent memory leak for certain C APIs because the original Buffer is not necessarily available to be manually freed. Still, fixes remaining problems with pbuffer support on X11 platforms. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1825 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Factored out the remaining toolkit, and specifically AWT, dependencies | Kenneth Russel | 2008-12-20 | 24 | -908/+1180 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from GLDrawableFactory implementations into NativeWindowFactory implementations. These dependencies were the up-front selection of the GraphicsConfiguration and the locking and unlocking of the toolkit, which are both currently needed only on X11 platforms due to how OpenGL and the window system interact there. Added X11GraphicsDevice and X11GraphicsConfiguration classes which are intended to be used by Newt or potentially other third-party window toolkits. Unified the separate NativeWindow and AWT GLDrawableFactory implementations in the GLDrawableFactory class. Exposed the toolkit locking mechanism through the NativeWindowFactory and introduced the concept of a default NativeWindowFactory which is used by the X11 drawable and context implementations. Removed unnecessary toolkit locking calls from Mac OS X and Windows drawable and context implementations. Added a registration mechanism for new NativeWindowFactories, allowing third parties to plug in new window toolkits orthogonally to the OpenGL drawable and context code. The public APIs for the NativeWindowFactory and the GLDrawableFactory, in particular how they are fetched, changed as a result of these refactorings. Updated all uses. Fixed bug in X11OffscreenGLXDrawable introduced during last set of changes. Tested demos on Solaris, Mac OS X and Windows. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1824 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Removed setSize(), setPosition(), setVisible(), and setFullscreen() | Kenneth Russel | 2008-12-16 | 22 | -161/+74 |
| | | | | | | | | | | | | from javax.media.opengl.NativeWindow interface as these are concerns of the window toolkit and not the OpenGL binding. Removed isVisible(), isFullscreen(), getX(), and getY(). getWidth() and getHeight() remain. Changed implementations of offscreen and pbuffer drawables and changed GLJPanel to destroy and re-create its offscreen GLDrawable upon resize rather than attempting to resize the GLDrawable directly. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1823 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Integrated work from several months ago to refactor GLJPanel | Kenneth Russel | 2008-12-16 | 1 | -735/+850 |
| | | | | | | | | | implementation into multiple backends: software, pbuffer and Java2D / OpenGL bridge. This will make it easier for the community to add more backends if desired, for example an FBO backend. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1822 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed bug in glMapBuffer native code generation and bug in | Kenneth Russel | 2008-12-16 | 4 | -8/+8 |
| | | | | | | | VertexBufferObject demo git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1821 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Moved javax.media.opengl.awt.gl2.GL2JPanel (back) to | Kenneth Russel | 2008-12-16 | 1 | -39/+39 |
| | | | | | | | | | javax.media.opengl.awt.GLJPanel because the expectation is that the AWT-based implementation will never need to run on only the ES1 or ES2 subset, and to conform to earlier releases' naming convention. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1820 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed nested toolkit locking problem with X11PbufferGLXDrawable. With | Kenneth Russel | 2008-12-14 | 17 | -76/+92 |
| | | | | | | | | | | this fix pbuffers and the GLJPanel are working again on X11 platforms. Moved lockToolkit, unlockToolkit and isToolkitLocked from GLDrawableFactory to GLDrawableFactoryImpl. Updated all call sites. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1819 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed initialization of chosen GLCapabilities on X11 platforms for | Kenneth Russel | 2008-12-13 | 2 | -5/+12 |
| | | | | | | | on-screen GLDrawables git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1818 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed NullPointerException during GLDrawable creation on X11 platforms | Kenneth Russel | 2008-12-13 | 1 | -1/+2 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1817 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed bug in pbuffer support on Mac OS X due to confusion about what | Kenneth Russel | 2008-12-12 | 2 | -27/+12 |
| | | | | | | | | the native window's surface handle contains. Fixed bug in computation of chosen GLCapabilities on Mac OS X. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1816 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Fixed breakage of GLJPanel caused by confusion between requested and | Kenneth Russel | 2008-12-12 | 21 | -109/+92 |
| | | | | | | | | | | | | | chosen GLCapabilities. Separated these out and refactored requested GLCapabilities into GLDrawableImpl superclass. Removed setChosenGLCapabilities from the public API and made it protected on GLDrawableImpl. Removed it from all public GLDrawable implementations such as GLCanvas and GLJPanel. Fixed bug in Gears demo where mouse listener was not being hooked up correctly. Tested so far on Windows; testing on other platforms to follow. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1815 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | Made compaction support optional in BackingStoreManager, and therefore | Kenneth Russel | 2008-12-07 | 3 | -11/+46 |
| | | | | | | | | | RectanglePacker, to make it easier for clients to get up and running; note that this also disallows expansion. Changed additionFailed to return a boolean. Updated GL2TextRenderer appropriately. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1814 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | clean | Sven Gothel | 2008-12-01 | 1 | -549/+0 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1813 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | OMX cleanup - generic tool | Sven Gothel | 2008-12-01 | 10 | -621/+1163 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1812 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | ? build | Sven Gothel | 2008-11-29 | 6 | -146/+168 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ? make/GnuCTreeParserTokenTypes.txt ? make/STDCTokenTypes.txt ? make/make.jogl.all.linux-x86.log ? make/make.jogl.cdcfp.linux-x86.log ? make/make.jogl.doc.all.log Index: make/build.xml =================================================================== RCS file: /cvs/jogl/make/build.xml,v retrieving revision 1.141.2.55 diff -r1.141.2.55 build.xml 356a357 > <property name="rootrel.src.c.openmax" value="src/native/openmax" /> 1453a1455 > <includepath path="stub_includes/openmax" if="useOpenMAX"/> Index: make/make.jogl.cdcfp.linux-x86.sh =================================================================== RCS file: /cvs/jogl/make/Attic/make.jogl.cdcfp.linux-x86.sh,v retrieving revision 1.1.2.5 diff -r1.1.2.5 make.jogl.cdcfp.linux-x86.sh 10c10 < # -Djava.generate.skip=true --- > # -Djava.generate.skip=true \ 20a21 > -Djava.generate.skip=true \ Index: src/classes/com/sun/javafx/media/video/openmax/OMXMoviePlayerImpl.java =================================================================== RCS file: /cvs/jogl/src/classes/com/sun/javafx/media/video/openmax/Attic/OMXMoviePlayerImpl.java,v retrieving revision 1.1.2.1 diff -r1.1.2.1 OMXMoviePlayerImpl.java 354a355 > gl.glDisable(gl.GL_TEXTURE_2D); Index: src/classes/javax/media/opengl/GLArrayDataWrapper.java =================================================================== RCS file: /cvs/jogl/src/classes/javax/media/opengl/Attic/GLArrayDataWrapper.java,v retrieving revision 1.1.2.1 diff -r1.1.2.1 GLArrayDataWrapper.java 165a166 > this.normalized = normalized; Index: src/native/newt/KDWindow.c =================================================================== RCS file: /cvs/jogl/src/native/newt/Attic/KDWindow.c,v retrieving revision 1.1.2.4 diff -r1.1.2.4 KDWindow.c 66c66 < #define DBG_PRINT(...) fprintf(stderr, __VA_ARGS__) --- > #define DBG_PRINT(...) fprintf(stdout, __VA_ARGS__) 73,74c73,74 < #define STDOUT_FILE "\\Storage Card\\jogl_demos\\stdout.txt" < #define STDERR_FILE "\\Storage Card\\jogl_demos\\stderr.txt" --- > #define STDOUT_FILE "\\Storage Card\\stdout.txt" > #define STDERR_FILE "\\Storage Card\\stderr.txt" Index: src/native/openmax/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c =================================================================== RCS file: /cvs/jogl/src/native/openmax/Attic/com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c,v retrieving revision 1.1.2.1 diff -r1.1.2.1 com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl.c 74c74 < JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1createInstance --- > JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1createInstance 87c87 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setStream --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setStream 105c105 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1updateStreamInfo --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1updateStreamInfo 117c117 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setEGLImageTexture2D --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setEGLImageTexture2D 129c129 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1activateInstance --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1activateInstance 142c142 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 146c146 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1play --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1play 149c149 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1play\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1play\n"); 161c161 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 165c165 < JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1stop --- > JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1stop 174c174 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 178c178 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setVolume --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setVolume 185c185 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 189c189 < JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getCurrentPosition --- > JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getCurrentPosition 198c198 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 202c202 < JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getCurrentLoaded --- > JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getCurrentLoaded 210c210 < JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getDuration --- > JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getDuration 218c218 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 222c222 < JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1step --- > JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1step 225c225 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1step\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1step\n"); 232c232 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 236c236 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setRate --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setRate 239c239 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setRate\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setRate\n"); 244c244 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 248c248 < JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setCurrentPosition --- > JNIEXPORT jlong JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setCurrentPosition 251c251 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1setRate\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1setRate\n"); 257c257 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 261c261 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1lock --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1lock 264c264 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1lock\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1lock\n"); 269c269 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 273c273 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1unlock --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1unlock 276c276 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1unlock\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1unlock\n"); 281c281 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 285c285 < JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getTextureID --- > JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getTextureID 288c288 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getTextureID\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getTextureID\n"); 299c299 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 303c303 < JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getWidth --- > JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getWidth 306c306 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getWidth\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getWidth\n"); 318c318 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 322c322 < JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getHeight --- > JNIEXPORT jint JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getHeight 325c325 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1getHeight\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1getHeight\n"); 337c337 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 341c341 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1task --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1task 348c348 < * Class: com_sun_javafx_media_video_openmax_OMXMovieImpl --- > * Class: com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl 352c352 < JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1destroyInstance --- > JNIEXPORT void JNICALL Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1destroyInstance 355c355 < //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMovieImpl__1destroy\n"); --- > //fprintf(stdout, "Java_com_sun_javafx_media_video_openmax_OMXMoviePlayerImpl__1destroy\n"); Index: src/native/openmax/omx_tool.c =================================================================== RCS file: /cvs/jogl/src/native/openmax/Attic/omx_tool.c,v retrieving revision 1.1.2.1 diff -r1.1.2.1 omx_tool.c 3a4,25 > #define VERBOSE_ON 1 > #define VERBOSE2_ON 1 > > #ifdef VERBOSE_ON > #define DBG_PRINT(...) fprintf(stdout, __VA_ARGS__) > #else > #define DBG_PRINT(...) > #endif > > #if defined(VERBOSE_ON) && defined(VERBOSE2_ON) > #define DBG_PRINT2(...) fprintf(stdout, __VA_ARGS__) > #else > #define DBG_PRINT2(...) > #endif > > #ifdef VERBOSE_ON > #ifdef _WIN32_WCE > #define STDOUT_FILE "\\Storage Card\\stdout.txt" > #define STDERR_FILE "\\Storage Card\\stderr.txt" > #endif > #endif > 29c51 < fprintf(stderr, "RuntimeException: %s\n", buffer); fflush(stderr); --- > DBG_PRINT( "RuntimeException: %s\n", buffer); 86a109,116 > > #ifdef VERBOSE_ON > #ifdef _WIN32_WCE > _wfreopen(TEXT(STDOUT_FILE),L"w",stdout); > _wfreopen(TEXT(STDERR_FILE),L"w",stderr); > #endif > #endif > 104d133 < _hasEGLSync = 0; // JAU 111c140 < printf("INVALIDATE\n"); fflush(stdout); --- > DBG_PRINT("INVALIDATE\n"); 140c169 < printf("event complete: cmd 0x%X, s:0x%X, component: %p - %s\n", (unsigned)nData1, (unsigned)nData2, hComponent, name); --- > DBG_PRINT("event complete: cmd 0x%X, s:0x%X, component: %p - %s\n", (unsigned)nData1, (unsigned)nData2, hComponent, name); 144c173 < printf("\t state -> StateLoaded\n"); --- > DBG_PRINT("\t state -> StateLoaded\n"); 151c180 < printf("\t flush\n"); --- > DBG_PRINT("\t flush\n"); 159c188 < printf("event buffer EOS: component: %p - %s\n", hComponent, name); --- > DBG_PRINT("event buffer EOS: component: %p - %s\n", hComponent, name); 162c191 < printf("\t end component - FIN\n"); --- > DBG_PRINT("\t end component - FIN\n"); 171c200 < printf("event error: 0x%X IncorrectTransition, component: %p - %s\n", (unsigned int) nData1, hComponent, name); --- > DBG_PRINT("event error: 0x%X IncorrectTransition, component: %p - %s\n", (unsigned int) nData1, hComponent, name); 177c206 < printf("event error: Same State 0x%X, component: %p - %s\n", (unsigned int) nData2, hComponent, name); --- > DBG_PRINT("event error: Same State 0x%X, component: %p - %s\n", (unsigned int) nData2, hComponent, name); 181c210 < printf("event error: 0x%X, component: %p - %s\n", (unsigned int) nData1, hComponent, name); --- > DBG_PRINT("event error: 0x%X, component: %p - %s\n", (unsigned int) nData1, hComponent, name); 214c243 < fprintf(stdout, "FillBufferDone avail %d\n", pOMXAV->available); fflush(stdout); --- > DBG_PRINT("FillBufferDone avail %d\n", pOMXAV->available); 232c261 < fprintf(stdout, "WaitForState p1 c:%p s1:0x%X s2:0x%X\n", hComponent, eTestState, eTestState2); fflush(stdout); // JAU --- > DBG_PRINT( "WaitForState p1 c:%p s1:0x%X s2:0x%X\n", hComponent, eTestState, eTestState2); 234c263 < fprintf(stdout, "WaitForState p2 s:0x%X e:0x%X\n", eState, eError); fflush(stdout); // JAU --- > DBG_PRINT( "WaitForState p2 s:0x%X e:0x%X\n", eState, eError); 245c274 < fprintf(stdout, "WaitForState p3 s:0x%X e:0x%X\n", eState, eError); fflush(stdout); // JAU --- > DBG_PRINT( "WaitForState p3 s:0x%X e:0x%X\n", eState, eError); 320c349 < fprintf(stdout, "OMXToolBasicAV_WaitForState %p s:%d\n", pOMXAV, state); fflush(stdout); // JAU --- > DBG_PRINT( "OMXToolBasicAV_WaitForState %p s:%d\n", pOMXAV, state); 322c351 < fprintf(stdout, "OMXToolBasicAV_WaitForState p1\n"); fflush(stdout); // JAU --- > DBG_PRINT( "OMXToolBasicAV_WaitForState p1\n"); 328c357 < fprintf(stdout, "OMXToolBasicAV_WaitForState p4 %d c:%p\n", i, pOMXAV->comp[i]); fflush(stdout); // JAU --- > DBG_PRINT( "OMXToolBasicAV_WaitForState p4 %d c:%p\n", i, pOMXAV->comp[i]); 332c361 < fprintf(stdout, "OMXToolBasicAV_WaitForState Failed (Wait) %d c:%p - %s, s:0x%X\n", --- > DBG_PRINT( "OMXToolBasicAV_WaitForState Failed (Wait) %d c:%p - %s, s:0x%X\n", 334d362 < fflush(stdout); // JAU 348,349c376,377 < fprintf(stdout, "RequestState p2 c:%p, e:0x%X, s:0x%X\n", < hComponent, eError, eState); fflush(stdout); // JAU --- > DBG_PRINT( "RequestState p2 c:%p, e:0x%X, s:0x%X\n", > hComponent, eError, eState); 353,354c381,382 < fprintf(stdout, "RequestState p3 c:%p e:0x%X s: 0x%X -> 0x%X\n", < hComponent, eError, eState, state); fflush(stdout); // JAU --- > DBG_PRINT( "RequestState p3 c:%p e:0x%X s: 0x%X -> 0x%X\n", > hComponent, eError, eState, state); 367c395 < fprintf(stdout, "OMXToolBasicAV_RequestState %p s:%d, w:%d\n", pOMXAV, state, wait); fflush(stdout); // JAU --- > DBG_PRINT( "OMXToolBasicAV_RequestState %p s:%d, w:%d\n", pOMXAV, state, wait); 369c397 < fprintf(stdout, "OMXToolBasicAV_RequestState p1\n"); fflush(stdout); // JAU --- > DBG_PRINT( "OMXToolBasicAV_RequestState p1\n"); 420c448 < fprintf(stderr, "Destroy p1\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p1\n"); 423c451 < fprintf(stderr, "Destroy p2\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p2\n"); 429c457 < fprintf(stderr, "Destroy p3\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p3\n"); 432c460 < fprintf(stderr, "Destroy p3\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p3\n"); 435c463 < fprintf(stderr, "Destroy p4\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p4\n"); 443c471 < fprintf(stderr, "Destroy p5\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p5\n"); 452c480 < fprintf(stderr, "Destroy p6\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p6\n"); 457c485 < fprintf(stderr, "Destroy p7\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p7\n"); 459c487 < fprintf(stderr, "Destroy p8\n"); fflush(stderr); --- > DBG_PRINT( "Destroy p8\n"); 464c492 < fprintf(stderr, "Destroy DONE\n"); fflush(stderr); --- > DBG_PRINT( "Destroy DONE\n"); 592c620 < fprintf(stdout, "Play 3.2\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 3.2\n"); 705c733 < fprintf(stdout, "Attach VR %p c:%p\n", pOMXAV, pOMXAV->comp[OMXAV_H_VSCHEDULER]); fflush(stdout); // JAU --- > DBG_PRINT( "Attach VR %p c:%p\n", pOMXAV, pOMXAV->comp[OMXAV_H_VSCHEDULER]); 708c736 < fprintf(stdout, "UseEGLImg port enable/tunneling %p\n", pOMXAV); --- > DBG_PRINT( "UseEGLImg port enable/tunneling %p\n", pOMXAV); 721c749 < fprintf(stdout, "UseEGLImg %p #%d t:%d i:%p s:%p p1\n", pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync); fflush(stdout); // JAU --- > DBG_PRINT( "UseEGLImg %p #%d t:%d i:%p s:%p p1\n", pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync); 735,736c763,764 < fprintf(stdout, "UseEGLImg %p #%d t:%d i:%p s:%p b:%p - p2\n", < pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync, pBuf->omxBufferHeader); fflush(stdout); // JAU --- > DBG_PRINT( "UseEGLImg %p #%d t:%d i:%p s:%p b:%p - p2\n", > pOMXAV, i, pBuf->tex, pBuf->image, pBuf->sync, pBuf->omxBufferHeader); 739c767 < fprintf(stdout, "UseEGLImg %p #%d DONE\n", pOMXAV, i); fflush(stdout); // JAU --- > DBG_PRINT( "UseEGLImg %p #%d DONE\n", pOMXAV, i); 752c780 < fprintf(stderr, "DetachVideoRenderer p0\n"); fflush(stderr); --- > DBG_PRINT( "DetachVideoRenderer p0\n"); 754c782 < fprintf(stderr, "DetachVideoRenderer DONE (already state loaded)\n"); fflush(stderr); --- > DBG_PRINT( "DetachVideoRenderer DONE (already state loaded)\n"); 759c787 < fprintf(stderr, "DetachVideoRenderer p1\n"); fflush(stderr); --- > DBG_PRINT( "DetachVideoRenderer p1\n"); 764c792 < fprintf(stderr, "DetachVideoRenderer p2\n"); fflush(stderr); --- > DBG_PRINT( "DetachVideoRenderer p2\n"); 780c808 < fprintf(stderr, "DetachVideoRenderer p3\n"); fflush(stderr); --- > DBG_PRINT( "DetachVideoRenderer p3\n"); 784c812 < fprintf(stderr, "DetachVideoRenderer DONE\n"); fflush(stderr); --- > DBG_PRINT( "DetachVideoRenderer DONE\n"); 795c823 < fprintf(stderr, "buffer number %d > MAX(%d)\n", vBufferNum, EGLIMAGE_MAX_BUFFERS); --- > DBG_PRINT( "buffer number %d > MAX(%d)\n", vBufferNum, EGLIMAGE_MAX_BUFFERS); 800c828 < fprintf(stderr, "Init struct failed!\n"); --- > DBG_PRINT( "Init struct failed!\n"); 830c858 < fprintf(stdout, "SetStream 1 %s ..\n", stream); fflush(stdout); // JAU --- > DBG_PRINT( "SetStream 1 %s ..\n", stream); 840c868 < fprintf(stdout, "SetStream 3\n"); fflush(stdout); // JAU --- > DBG_PRINT( "SetStream 3\n"); 852c880 < fprintf(stdout, "SetStream 4\n"); fflush(stdout); // JAU --- > DBG_PRINT( "SetStream 4\n"); 905c933 < fprintf(stdout, "SetStream 5 ; audioPort %d, videoPort %d\n", pOMXAV->audioPort, pOMXAV->videoPort); fflush(stdout); // JAU --- > DBG_PRINT( "SetStream 5 ; audioPort %d, videoPort %d\n", pOMXAV->audioPort, pOMXAV->videoPort); 909c937 < fprintf(stdout, "Configuring comp[OMXAV_H_CLOCK]\n"); --- > DBG_PRINT( "Configuring comp[OMXAV_H_CLOCK]\n"); 925c953 < fprintf(stdout, "SetStream X\n"); fflush(stdout); // JAU --- > DBG_PRINT( "SetStream X\n"); 941c969 < fprintf(stdout, "SetEGLImg %p #%d/%d t:%d i:%p s:%p..\n", pOMXAV, i, pOMXAV->vBufferNum, tex, image, sync); fflush(stdout); // JAU --- > DBG_PRINT( "SetEGLImg %p #%d/%d t:%d i:%p s:%p..\n", pOMXAV, i, pOMXAV->vBufferNum, tex, image, sync); 961c989 < fprintf(stdout, "ActivateInstance 1\n"); fflush(stdout); // JAU --- > DBG_PRINT( "ActivateInstance 1\n"); 1000c1028 < fprintf(stdout, "Setup tunneling\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Setup tunneling\n"); 1005c1033 < fprintf(stdout, "Setup tunneling audio\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Setup tunneling audio\n"); 1012c1040 < fprintf(stdout, "Setup tunneling video\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Setup tunneling video\n"); 1017c1045 < fprintf(stdout, "ActivateInstance .. %p\n", pOMXAV); fflush(stdout); --- > DBG_PRINT( "ActivateInstance .. %p\n", pOMXAV); 1031c1059 < fprintf(stdout, "ActivateInstance done %p\n", pOMXAV); fflush(stdout); --- > DBG_PRINT( "ActivateInstance done %p\n", pOMXAV); 1090c1118 < fprintf(stderr, "Err: Play invalid"); fflush(stderr); --- > fprintf(stderr, "Err: Play invalid"); 1097c1125 < fprintf(stdout, "Play 1\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 1\n"); 1099c1127 < fprintf(stdout, "Play 2\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 2\n"); 1109c1137 < fprintf(stdout, "Play 3.0\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 3.0\n"); 1112c1140 < fprintf(stdout, "Play 3.1\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 3.1\n"); 1119c1147 < fprintf(stdout, "Play 3.2\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 3.2\n"); 1125c1153 < fprintf(stdout, "Play 3.3\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 3.3\n"); 1127c1155 < fprintf(stdout, "Play 4.0\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play 4.0\n"); 1131c1159 < fprintf(stdout, "Play DONE\n"); fflush(stdout); // JAU --- > DBG_PRINT( "Play DONE\n"); 1299,1300c1327,1328 < // fprintf(stdout, "GetTexture A avail %d, filled %d, pos o:%d g:%d\n", < // pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos); fflush(stdout); --- > DBG_PRINT2("GetTexture A avail %d, filled %d, pos o:%d g:%d\n", > pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos); 1310c1338 < // fprintf(stdout, "GetTexture p2.1 attr 0x%X\n", attr); fflush(stdout); --- > DBG_PRINT2( "GetTexture p2.1 attr 0x%X\n", attr); 1314c1342 < // fprintf(stdout, "GetTexture p2.2\n", attr); fflush(stdout); --- > DBG_PRINT2( "GetTexture p2.2\n"); 1321c1349 < // fprintf(stdout, "GetTexture p2.3\n", attr); fflush(stdout); --- > DBG_PRINT2( "GetTexture p2.3\n"); 1328c1356 < // fprintf(stdout, "GetTexture p3.1\n"); fflush(stdout); --- > DBG_PRINT2("GetTexture p3.1\n"); 1338c1366 < // fprintf(stdout, "GetTexture p3.2\n"); fflush(stdout); --- > DBG_PRINT2( "GetTexture p3.2\n"); 1347,1348c1375,1376 < // fprintf(stdout, "GetTexture B avail %d, filled %d, pos o:%d g:%d t:%d\n", < // pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos, texID); fflush(stdout); --- > DBG_PRINT2( "GetTexture B avail %d, filled %d, pos o:%d g:%d t:%d\n", > pOMXAV->available, pOMXAV->filled, pOMXAV->omxPos, pOMXAV->glPos, texID); 1368,1372d1395 < #ifdef _WIN32_WCE < #define STDOUT_FILE "\\Storage Card\\stdout.txt" < #define STDERR_FILE "\\Storage Card\\stderr.txt" < #endif < 1427,1431d1449 < #ifdef _WIN32_WCE < _wfreopen(TEXT(STDOUT_FILE),L"w",stdout); < _wfreopen(TEXT(STDERR_FILE),L"w",stderr); < #endif < 1538c1556 < printf("7\n"); fflush(stdout); --- > printf("7\n"); 1543c1561 < printf("8\n"); fflush(stdout); --- > printf("8\n"); 1548c1566 < printf("8.2\n"); fflush(stdout); --- > printf("8.2\n"); 1557c1575 < printf("Sleep %d\n", i); fflush(stdout); --- > printf("Sleep %d\n", i); git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1811 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | ../jogl.log | Sven Gothel | 2008-11-27 | 30 | -19/+10171 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1810 232f8b59-042b-4e1e-8c03-345bb8c30851 | ||||
* | KD Fix: Use EGL AttributeList directly | Sven Gothel | 2008-11-27 | 9 | -102/+89 |
| | | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1809 232f8b59-042b-4e1e-8c03-345bb8c30851 |