| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1895 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
public and implementation packages and into
com.sun.opengl.util.glsl.fixed.* and other subpackages of
com.sun.opengl.util. Renamed javax.media.opengl.sub.GLObject to
javax.media.opengl.GLBase. Moved interfaces in
javax.media.opengl.sub.fixed to javax.media.opengl.fixedfunc and
changed naming convention. Moved all classes in
javax.media.opengl.util to com.sun.opengl.util. Moved
com.sun.opengl.impl.packrect to com.sun.opengl.util.packrect. Renamed
InternalBufferUtils to InternalBufferUtil to match naming convention
and copied in needed routines for GLU and other classes. Fixed build
breakage when specifying rootrel.build property; reintroduced
build-temp directory. Updated demos.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1886 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1881 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1876 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1873 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
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
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
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
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
? 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
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Uses GLCapabilities for window creation
- Note: This is implemented in the new KDWindow only, for now.
- FIXME: Respect GLCapabilities for other implementations (X11, MacOS, Windows)
visualID shall be determined by GLCapabilities,
and set to 0 if not implemented.
- New OpenKODE KDWindow
- Compile native code at with 'ant -DuseKD=true'
- Use KD in newt with the Java property set newt.ws.name=KD
- API change:
NewtFactory.createWindow() takes GLCapabilities insteast of a fake visualID
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1804 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1799 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
| |
desktop. Changed GLCanvas to set the GLProfile to GL2 by default since
there are no plans to support the AWT components on anything except
desktop profiles, where OpenGL ES is not present. This reduces the
amount of changes that must be made to code using earlier versions of
JOGL.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1796 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1792 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
| |
- Migrated gluegen_egl with egl for easier maintenance
- Updated egl header to NV latest incl extensions
- Added common stdint helper
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1790 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Function availability is checked by the dynamic ProcAddressTable,
so it works as described/desired and removed around 30 kB of text.
- Adding EGLExt to support EGLImage to share video buffers
between another API (e.g. OpenMax)
- EGL: Added platform extension query support
- EGLClientBuffer is opaque long
- GLXExt: Removed duplicated enumerates from GLX
- GLContext: Promoted getPlatformExtensionsString()
- GLProfile.setProfile<GL*>(void) changed order of
setting the GL profile to: highest -> lowest:
GL2 .. GL2ES12 .. GLES2 .. GLES1
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1784 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1777 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1771 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1762 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
| |
ME versions to be able to compile the majority of the TextureIO
package for Java ME / CDC / FP while waiting for full Java SE 5
classes on devices. Java ME ports have not been tested.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1758 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
to optionally disable the debug information in the result.
This speeds up the runtime on the handheld!
..
ImmModeSink: Experimental disable VBO usage (perf. tests)
in case high frequency data change has an impact (-> Ragdoll).
(Negative ..)
..
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1751 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
APX 2500
ES 2.0 + FixedFunction GLSL
ES 1.0
+++
javax.media.opengl.glsl
- Shader and program state management
- Loading and merging shader source code
- Loading binaries incl. auto selection
of the binary file in respect to the supported binary format.
I.e. in case of GLES2.GL_NVIDIA_PLATFORM_BINARY_NV:
source: com/sun/opengl/impl/glsl/fixed/shader/ashader.fp
binary: com/sun/opengl/impl/glsl/fixed/shader/bin/nvidia/ashader.bfp
ShaderCode sc = ShaderCode.create( gl, gl.GL_VERTEX_SHADER, 1, FixedFuncPipeline.class,
"shader", "shader/bin", "ashader");
(Derivation of com.sun.javafx.graphics.gl2es2.ShaderUtil)
javax.media.opengl.sdk.glsl
CompileShaderNVidia implements abstract CompileShader
Toolkit to convert JOGL shader source to binaries,
according to the location rule as described in ShaderCode.
Example: Converts all fixed function shader to binaries.
jogl/src/classes/com/sun/opengl/impl/glsl/fixed/shader/scripts/nvidia-apx/glslc-ff.bat
(Generalization of com.sun.javafx.graphics.gl2es2.PrecompileNVShader)
+++
Fixed function now resides in 'jogl.fixed.jar'
- contains shader source and binaries
- contains the implementation
GL2ES2:
- removed glShaderBinaryOrSource()
- use glCreateLoadShader() for binary and
glCreateCompileShader() for source
- using addition glGetError() check for shader upload/compilation
- Skipping 'glValidateProgram' in case of ES2 and no compiler,
since it fails on APX2500 ..
- added: (caching the results)
"public Set glGetShaderBinaryFormats()"
"public boolean glShaderCompilerAvailable()"
- shader-name and binary-data buffer: use 'remaining()'
instead of 'limit()'
BufferUtil:
- adding variant: <Type>Buffer new<Type>Buffer(<type>[] values, int offset, int len)
+++
Working on all profiles ES1 + ES2 (CVM) with lighting:
demo.es1.cube.Cube
demo.es1.cube.CubeImmModeSink
demo.es1.cubefbo.Main
javabullet.demos.genericjoint.GenericJointDemo
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1749 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1748 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1742 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1741 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
| |
available. Fixed building with -Djogl.cdcfp, in particular nested
building of gluegen. Took out call to SHFullScreen, which doesn't seem
to be available on the NVidia APX 2500 any more. Fixed #includes in
InternalBufferUtils.c.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1738 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1735 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1734 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Intersection of GL2 + GLES1 + GLES2
- Common set of GLES1 + GLES2
- Utilized new 'ExtendedInterfaceSymbolsOnly' gluegen config
- DroppingUniqVendorExtension + 3DFX + APPLE
- Some APPLE enumerates are manually provided!
- Removing of 'jogl.oswin.jar' - since it is redundant now!
- Proper partitioning of 'jogl.gl2' and 'jogl.gl2es12' for
- x11, win and osx
- Profile selection/trial for e.g. GL2ES1 is now in the following order:
1) GLES1
2) GL2ES12
3) GL2
- Footprint for all profiles below 1/2 MB,
NEWT:
ES1: 284 kB
ES2: 280 kB
GL2ES12: 332 kB
GL2: 456 kB
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1729 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1728 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1726 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
source file>'
and get rid of manual 'Ignore' configs for common stuff in the base interfaces.
- Add: GLUnsupportedException:
- Using new config feature 'UnsupportedExceptionType GLUnsupportedException'
- GLUnsupportedException is used for anything 'UnsupportedOperationException'
- GLU:
- GLU itself is no more abstract
- GLU contains the tesselator implementation
- name, return type, modifiers and arguments
- createGLU(..)
- operated by profile name now.
- GLU itself will be used for GLES2
- Cleanup:
- gluegen/GL configs ..
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1725 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1711 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1710 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Terminology:
ARB Extensions: "GL2", "ARB", "OES", "OML"
Vendor Extensions: "EXT", "NV", "ATI", "SGI", "SGIS", "SGIX", "HP", "IBM", "WIN"
Pass-1 Unify ARB extensions with the same value
Pass-2 Unify vendor extensions,
if exist as an ARB extension with the same value.
Pass-3 Emit
Done:
- Unification of GL enumerates
- Unification of GL functions
- dynamic extension lookup
- ..
TODO:
- Break down GL.java: GL + GL2ES1ES2 (for future GL3, etc)
- Add a GL2 small implementation, to only support the GL2ES2 subset,
'GL2SubES2' ..
+++
- Fixed X11 build breakage of 'jawt' linkage.
- Fixed NEWT native code mouse- and keyevent id's,
missed sync while moving them from the bitfield notation.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1708 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
| |
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1706 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
| |
gluegen-cpptasks. Fixed bug related to ant class loaders, definition
of cpptasks types, subclassing of compilers and linkers, and use of
antcall by defining c.build using macrodef instead of target and
invoking it directly instead of via antcall. This fixes the root cause
of the build breakage on Windows caused by the recent gluegen-cpptasks
refactoring.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1705 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
easier to build native sources via Ant. Provided new
gluegen.cpptasks.setup.compiler target which sets up
platform-independent compiler and linker IDs and other properties
which can be used in other projects' build files. Refactored JOGL
build to use some of these new properties and eliminate duplication;
more code savings possible. Added new GLWindow class to Newt
implementing GLAutoDrawable to increase code sharing, and supporting
making OpenGL calls inside of EventListener callbacks. Moved repaint()
method from GLAutoDrawable to AWTGLAutoDrawable. Added WindowEvent and
WindowListener interfaces to Newt, currently implemented on Windows
and AWT backends (X11 backend would need to support and watch for
window resizes -- FIXME added). Refactored common functionality into
Newt Event class. Renumbered event IDs to avoid collisions. Fixed
potential problems with removing event listeners inside of
EventListener callbacks.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1702 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Re-adding cdcfp:
com/sun/opengl/impl/glu/mipmap/*
com/sun/opengl/impl/GLPbufferImpl.java
Using 'BufferUtil.nativeOrder(ByteBuffer)'
to set up the native byte order.
'BufferUtil.nativeOrder' is now public.
GLDrawableFactory:
- removed 'hardcoded' awt attribute.
Cleanup NEWT's AWT wrapping implementation.
- NativeWindowFactory incooperates with the wrapping property.
Bugs on X11/NEWT/AWT:
- no events
- deadlock at shutdown
- deadlock if EGLDrawable with AWT get's locked
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1700 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
re-host Newt on lower level code when a port to an AWT-less Mac OS
X-based mobile device is done. Added support to NativeWindow and Newt
for wrapping a Java-based window from a toolkit like the AWT, and
added appropriate code to the GLDrawableFactory implementations to
recognize and handle these NativeWindows. Fixed naming of native
method for JAWT_DrawingSurfaceInfo.platformInfo0(). Fixed linker
definition on Mac and cleaned up Windows variants. Fixed intptr_t
definitions in ES1 and ES2 native code. Added workaround for GLU type
reference in com.sun.opengl.util.texture.Texture. Fixed bugs in Newt
event dispatching. Tested with RedSquare demo on Mac OS X.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1698 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
FIXME: java.nio.ByteOrder usage.
gl-impl-CustomJavaCode-gles1.java
gl-impl-CustomJavaCode-gles2.java
Commented out usage of java.nio.ByteOrder,
ie. ByteBuffer.order(java.nio.ByteOrder.nativeOrder()),
since it is not available on JSR 239 cdcfp ..
Removed mipmap functionality in GLU and GLUes1,
since the mipmap implementation is heavily using
java.nio.ByteOrder (see above)
Removed classes/packages:
com/sun/opengl/impl/glu/mipmap/**
com/sun/opengl/util/texture/**
com/sun/opengl/util/io/TGAWriter.java
com/sun/opengl/impl/GLPbufferImpl.java
since they are heavily using java.nio.ByteOrder (see above)
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1697 232f8b59-042b-4e1e-8c03-345bb8c30851
|
|
|
|
|
|
|
|
|
| |
Not working yet due to mismatch between Newt's getWindowHandle(),
which returns an HWND, and the WGL code, which expects an HDC. Work
still ongoing.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1694 232f8b59-042b-4e1e-8c03-345bb8c30851
|