[libjogl2-java] 02/04: Merge tag 'upstream/2.2.4'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Oct 21 08:04:18 BST 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjogl2-java.
commit f5baac3cdb7ecd519ef4a9fe33e49673b13197e2
Merge: 9f57242 5286085
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Oct 20 17:07:00 2014 +0200
Merge tag 'upstream/2.2.4'
Upstream version 2.2.4
doc/bouml | 1 -
jnlp-files/jogl-applet-bug818_gljpanel01.html | 12 +-
...anel01.html => jogl-applet-gl2_gljpanel02.html} | 12 +-
jnlp-files/jogl-test-applets.html | 3 +-
make/build-test.xml | 233 +++----
make/build.xml | 6 +-
.../assets-test/arrow-blue-alpha-64x64.png | Bin 0 -> 2327 bytes
.../assets-test/arrow-red-alpha-64x64.png | Bin 0 -> 2331 bytes
make/resources/assets-test/red-16x16.png | Bin 0 -> 168 bytes
make/resources/assets-test/red-32x32.png | Bin 0 -> 383 bytes
make/scripts/run-tests-linux-x86_64.sh | 3 +
make/scripts/run-tests-osx.sh | 3 +
make/scripts/tests-win.bat | 8 +-
make/scripts/tests-x32-dbg.bat | 2 +-
make/scripts/tests-x32.bat | 2 +-
make/scripts/tests-x64-dbg.bat | 3 +-
make/scripts/tests-x64.bat | 2 +-
make/scripts/tests.sh | 20 +-
.../classes/com/jogamp/graph/curve/Region.java | 5 +-
.../com/jogamp/graph/curve/opengl/GLRegion.java | 8 +-
.../jogamp/graph/curve/opengl/RegionRenderer.java | 9 +
.../classes/com/jogamp/graph/geom/Outline.java | 5 +-
src/jogl/classes/com/jogamp/opengl/FBObject.java | 666 +++++++++++++++------
.../com/jogamp/opengl/GLRendererQuirks.java | 129 +++-
.../classes/com/jogamp/opengl/math/FloatUtil.java | 18 +-
src/jogl/classes/com/jogamp/opengl/math/Ray.java | 4 +-
.../com/jogamp/opengl/math/geom/AABBox.java | 6 +-
.../com/jogamp/opengl/math/geom/Frustum.java | 14 +-
.../classes/com/jogamp/opengl/util/Animator.java | 152 +++--
.../com/jogamp/opengl/util/AnimatorBase.java | 33 +-
.../com/jogamp/opengl/util/FPSAnimator.java | 89 +--
.../classes/com/jogamp/opengl/util/GLBuffers.java | 15 +-
.../com/jogamp/opengl/util/GLDrawableUtil.java | 2 +-
.../jogamp/opengl/util/GLPixelStorageModes.java | 20 +-
.../com/jogamp/opengl/util/glsl/ShaderCode.java | 6 +-
.../opengl/util/stereo/StereoClientRenderer.java | 13 +-
src/jogl/classes/javax/media/opengl/GLContext.java | 1 +
.../classes/javax/media/opengl/GLFBODrawable.java | 30 +-
src/jogl/classes/javax/media/opengl/GLProfile.java | 174 ++++--
.../javax/media/opengl/GLSharedContextSetter.java | 16 +
.../classes/javax/media/opengl/awt/GLCanvas.java | 22 +-
.../classes/javax/media/opengl/awt/GLJPanel.java | 171 ++++--
.../graph/curve/opengl/VBORegion2PMSAAES2.java | 10 +-
.../graph/curve/opengl/VBORegion2PVBAAES2.java | 6 +-
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 234 ++++----
.../jogamp/opengl/GLDrawableFactoryImpl.java | 18 +-
.../classes/jogamp/opengl/GLDrawableHelper.java | 46 +-
.../classes/jogamp/opengl/GLFBODrawableImpl.java | 181 +++---
.../jogamp/opengl/GLOffscreenAutoDrawableImpl.java | 2 +-
.../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 2 +-
.../windows/wgl/WindowsPbufferWGLDrawable.java | 12 +-
.../wgl/WindowsWGLGraphicsConfiguration.java | 132 ++--
.../WindowsWGLGraphicsConfigurationFactory.java | 64 +-
.../native/macosx/MacOSXWindowSystemInterface.m | 2 +-
.../javax/media/nativewindow/util/PixelFormat.java | 7 +-
.../javax/media/nativewindow/util/Rectangle.java | 6 +
.../jogamp/nativewindow/GlobalToolkitLock.java | 9 +-
.../jogamp/nativewindow/NullToolkitLock.java | 11 +-
.../jogamp/nativewindow/ResourceToolkitLock.java | 12 +-
.../nativewindow/SharedResourceToolkitLock.java | 9 +-
src/nativewindow/native/macosx/OSXmisc.m | 9 +-
src/newt/classes/com/jogamp/newt/Display.java | 10 +-
.../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 23 +-
.../classes/com/jogamp/newt/opengl/GLWindow.java | 4 +-
.../jogamp/newt/driver/bcm/egl/ScreenDriver.java | 1 +
.../jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java | 1 +
.../jogamp/newt/driver/intel/gdl/ScreenDriver.java | 1 +
.../jogamp/newt/driver/kd/ScreenDriver.java | 1 +
.../jogamp/newt/driver/macosx/DisplayDriver.java | 5 +-
.../jogamp/newt/driver/windows/ScreenDriver.java | 1 +
.../jogamp/newt/driver/x11/DisplayDriver.java | 3 -
.../jogamp/newt/driver/x11/ScreenDriver.java | 1 +
.../graph/demos/ui/GLEventListenerButton.java | 4 +-
.../acore/TestBug669RecursiveGLContext01NEWT.java | 4 +-
.../acore/TestBug669RecursiveGLContext02NEWT.java | 4 +-
.../jogl/acore/TestFBOAutoDrawableDeadlockAWT.java | 2 +-
.../jogl/acore/TestFBOAutoDrawableFactoryNEWT.java | 55 +-
.../test/junit/jogl/acore/TestFBOMRTNEWT01.java | 6 +-
.../junit/jogl/acore/TestFBOMix2DemosES2NEWT.java | 45 +-
.../junit/jogl/acore/TestPBufferDeadlockAWT.java | 2 +-
.../junit/jogl/acore/TestSharedContextListAWT.java | 2 +-
.../jogl/acore/TestSharedContextListNEWT.java | 2 +-
.../jogl/acore/TestSharedContextListNEWT2.java | 2 +-
.../jogl/acore/TestSharedContextVBOES1NEWT.java | 2 +-
.../jogl/acore/TestSharedContextVBOES2NEWT0.java | 4 +-
.../jogl/acore/TestSharedContextVBOES2NEWT1.java | 48 +-
.../jogl/acore/TestSharedContextVBOES2NEWT2.java | 14 +-
.../jogl/acore/TestSharedContextVBOES2NEWT3.java | 7 +-
.../junit/jogl/acore/TestVersionSemanticsNOUI.java | 55 +-
.../jogl/awt/TestAWT03GLCanvasRecreate01.java | 134 +++--
...ate01.java => TestAWT03GLJPanelRecreate01.java} | 161 +++--
.../junit/jogl/caps/TestMultisampleES2NEWT.java | 6 +-
.../opengl/test/junit/jogl/demos/es1/GearsES1.java | 67 ++-
.../test/junit/jogl/demos/es1/GearsObjectES1.java | 4 +
.../test/junit/jogl/demos/es2/FBOMix2DemosES2.java | 19 +-
.../opengl/test/junit/jogl/demos/es2/GearsES2.java | 107 ++--
.../demos/es2/TextureDraw02ES2ListenerFBO.java | 25 +-
.../demos/es2/awt/TestGearsES2GLJPanelAWT.java | 34 ++
.../jogl/demos/es2/newt/TestGearsES2NEWT.java | 45 +-
.../jogl/demos/es2/newt/TestLandscapeES2NEWT.java | 2 +-
.../es2/newt/TestLandscapeES2NewtCanvasAWT.java | 14 +-
.../opengl/test/junit/jogl/demos/gl2/Gears.java | 204 ++++---
.../opengl/test/junit/jogl/demos/gl2/Teapot.java | 62 +-
...t.java => Bug818GLJPanelAndGLCanvasApplet.java} | 30 +-
.../gl2/awt/GLJPanelsAndGLCanvasDemoGL2Applet.java | 180 ++++++
.../jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java | 51 ++
...TessellationShader01aGLSL440CoreHardcoded.java} | 52 +-
.../jogl/demos/gl4/TessellationShader01bGL4.java | 26 +-
.../gl4/newt/TestTessellationShader01GL4NEWT.java | 4 +-
.../test/junit/jogl/stereo/StereoDemo01.java | 1 +
.../junit/newt/TestWindowAndPointerIconNEWT.java | 142 +++++
.../test/junit/newt/mm/TestScreenMode00aNEWT.java | 18 +
.../test/junit/newt/mm/TestScreenMode00cNEWT.java | 13 +-
.../test/junit/newt/mm/TestScreenMode01aNEWT.java | 2 +-
.../jogamp/opengl/test/junit/util/MiscUtils.java | 7 +
.../jogamp/opengl/test/junit/util/UITestCase.java | 110 ++--
116 files changed, 3088 insertions(+), 1431 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git
More information about the pkg-java-commits
mailing list