aboutsummaryrefslogtreecommitdiffstats
path: root/make
Commit message (Collapse)AuthorAgeFilesLines
* javadoc update (2)Sven Gothel2009-03-131-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 updateSven Gothel2009-03-132-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 Gothel2009-03-135-12/+18
| | | | | | | 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 KeymappingSven Gothel2009-03-131-0/+14
| | | | 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
* Unified some double GL enums (register combiner), ..Sven Gothel2009-03-062-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 Gothel2009-03-0538-1061/+609
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fixed ArgumentIsString directive for glProgramStringARB (nowKenneth Russel2009-01-122-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
* Native (non-AWT) port of Newt to Mac OS X using Cocoa. MostKenneth Russel2009-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 FileUtil and StreamUtil classes back into com.sun.opengl.utilKenneth Russel2008-12-301-1/+1
| | | | | | | | | 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 allowKenneth Russel2008-12-301-2/+2
| | | | | | | | | | | 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 Russel2008-12-301-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
* Fixed more bugs in glue code generation related to using opaque longKenneth Russel2008-12-202-3/+7
| | | | | | | | | | | 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
* Fixed bug in glMapBuffer native code generation and bug inKenneth Russel2008-12-164-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
* OMX cleanup - generic toolSven Gothel2008-12-013-10/+10
| | | | 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
* ? buildSven Gothel2008-11-292-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ? 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.logSven Gothel2008-11-2724-16/+7513
| | | | 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 directlySven Gothel2008-11-275-66/+66
| | | | 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
* Newt-KD: window working, pointer event buggySven Gothel2008-11-263-2/+26
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1806 232f8b59-042b-4e1e-8c03-345bb8c30851
* Newt WindowSven Gothel2008-11-268-4/+1206
| | | | | | | | | | | | | | | | | | | - 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
* Added GLU_TESS_AVOID_DEGENERATE_TRIANGLES boolean property to the GLUKenneth Russel2008-11-241-0/+2
| | | | | | | | | | | tessellator to try to improve the triangulation to support antialiasing in the JavaFX graphics stack. The new code largely works as intended, but is not as robust as desired, and also does not completely solve the problem. Checking in nonetheless to checkpoint the work. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1802 232f8b59-042b-4e1e-8c03-345bb8c30851
* Adding missing EGLExtImpl_JNI.cSven Gothel2008-11-223-2/+12
| | | | 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
* Fixed build.xml to build correct version of TextureIO classes on theKenneth Russel2008-11-211-2/+3
| | | | | | | | | | | 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
* Moved gluErrorString, gluCheckExtension and gluGetString to base GLU classKenneth Russel2008-11-214-21/+23
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1795 232f8b59-042b-4e1e-8c03-345bb8c30851
* Adding wince6 vs9 project filesSven Gothel2008-11-206-0/+5391
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1794 232f8b59-042b-4e1e-8c03-345bb8c30851
* EGLDrawable: Update the capabilities to the chosen one by EGLSven Gothel2008-11-191-0/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1793 232f8b59-042b-4e1e-8c03-345bb8c30851
* Package com/sun/opengl/impl/packrect is now part of utilities and cdcfpSven Gothel2008-11-191-2/+2
| | | | 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
* - EGL/EGLExtSven Gothel2008-11-1412-840/+326
| | | | | | | | | - 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
* - EGLSven Gothel2008-11-141-0/+9
| | | | | | | | | | | | | | | | | | | | | - Adding 'eglGetProcAddress(long eglGetProcAddressHandle, String funcName)', to be able to bootstrap 'eglGetProcAddress'. - EGLDrawableFactory - Adding ES2 libname GLES20 - Adding dynamicLookupFunctionOnLibs: Lookup in the libraries (dlsym) - Change dynamicLookupFunction: - Bootstrap 'eglGetProcAddress' first - 1st try eglGetProcAddress - 2nd try dynamicLookupFunctionOnLibs - GLContextImpl.isFunctionAvailable() - 1st try GL proc table (cached) - 2nd try platform extension proc table (cached) - 3rd try EGLDrawableFactory.dynamicLookupFunction (not cached) git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1787 232f8b59-042b-4e1e-8c03-345bb8c30851
* Rollback: EGLConfig back to wrapped buffer, since long nio buffers are not ↵Sven Gothel2008-11-132-3/+1
| | | | | | available on CVM git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1786 232f8b59-042b-4e1e-8c03-345bb8c30851
* Adding missing files for EGLExt supportSven Gothel2008-11-132-0/+129
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1785 232f8b59-042b-4e1e-8c03-345bb8c30851
* - Removed StaticGLInfo usage.Sven Gothel2008-11-135-37/+22
| | | | | | | | | | | | | | | | | | | | | | | 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
* starte native Cocoa based window implementationGerard Ziemski2008-10-174-13/+13
| | | | 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
* rename setCurrentContextOpacity to setContextOpacityGerard Ziemski2008-10-171-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1776 232f8b59-042b-4e1e-8c03-345bb8c30851
* add ability to set opacity on GL context: setCurrentContextOpacity takes 0 or 1Gerard Ziemski2008-10-171-0/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1775 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixes for building with Visual C++ 6.0 (VC98)Kenneth Russel2008-09-161-0/+7
| | | | 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
* BufferUtil:Sven Gothel2008-08-291-8/+14
| | | | | | | | | | | | | | | | | - new GL type tools - new put methods ImmModeSink: - using 1 VBO array for 1-4 attributes GLArrayData - split into GLArrayData and GLArrayDataEditable, the latter of modifying purposes only - GLArrayDataWrapper implements a container only git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1764 232f8b59-042b-4e1e-8c03-345bb8c30851
* Cleanup GLArrayData*, misc stuffSven Gothel2008-08-214-1/+19
| | | | 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
* Temporarily split some TextureIO-related classes into Java SE and Java Kenneth Russel2008-08-171-2/+17
| | | | | | | | | 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
* ShaderState:Sven Gothel2008-08-142-1/+7
| | | | | | | | | | | | | | - reset: - lookup attributes first and process, if available - update the location in the state Fixed: - Add: CullFace (lill speed enhancement with textures) - Note: APX 2500 doesn't support blending, disregarding the ES 2.0 spec Blending must be implemented in the shader. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1756 232f8b59-042b-4e1e-8c03-345bb8c30851
* GLArrayData*Sven Gothel2008-08-137-37/+67
| | | | | | | | | | | | | | | | | | | | | - cleanup names and enable/disable code - bail out if components==0 in GL* impl. - add passing the VBO name for wrapping VBO server objects from the fixed function calls ShaderState: - reset: - only pass _enabled_ vertex attribute data in case of a reset - enable VBO in case of a wrapped VBO server object Fixed: - Added glMaterialf to GL (enables Angeles demo) - Working: Angeles on ES2 git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1755 232f8b59-042b-4e1e-8c03-345bb8c30851
* Adding build.xml property: 'javacdebug' and 'javacdebuglevel',Sven Gothel2008-08-122-3/+11
| | | | | | | | | | | | | | | | | 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
* Working:Sven Gothel2008-08-128-81/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* FixedFunction shader as files, prepared for binary shader filesSven Gothel2008-08-111-1/+6
| | | | 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
* Minor CVM/ES1 fixesSven Gothel2008-08-111-0/+14
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1747 232f8b59-042b-4e1e-8c03-345bb8c30851
* Removed unnecessary use of reflection which was showing up hot on Kenneth Russel2008-08-115-59/+176
| | | | | | | profiles of some JavaFX content git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1746 232f8b59-042b-4e1e-8c03-345bb8c30851
* Stopped squelching exception stack traces during GLU construction, and Kenneth Russel2008-08-091-4/+6
| | | | | | | commented out currently unneeded code path git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1744 232f8b59-042b-4e1e-8c03-345bb8c30851
* Removed unnecessary GL2 dependencies from desktop window system code. Kenneth Russel2008-08-081-0/+9
| | | | | | | | | | | | Moved Linux-specific DRIHack into shared code so it could be called from the common code path in GLProfile which now loads the shared libraries. Temporarily ignored WGL_OML_sync_control and WGL_NV_gpu_affinity extensions to avoid dependencies on NIO classes (java.nio.LongBuffer) not in CDC/FP/JSR-239 NIO profile. Can now run JOGL with CVM on the desktop. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1743 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed new glsl packagingSven Gothel2008-08-042-14/+15
| | | | 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
* ../jogl.logSven Gothel2008-08-0414-159/+339
| | | | 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
* Fixed loading of GLES and EGL libraries, and error reporting when none Kenneth Russel2008-07-311-1/+4
| | | | | | | | | | 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