Skip to content
The Jenkins Controller is preparing for shutdown. No new builds can be started.
Success

Changes

Summary

  1. jogl: replce more unneeded String() construction (details)
  2. jogl: remove clone() method that only throws Exceptions (details)
  3. jogl: remove clone() version that can only ever fail (details)
  4. jogl: enable generics annotations on TextRenderer (details)
  5. jogl: adapt code generator to output @Override annotations in various (details)
  6. jogl: use .format() to build the method signature when generating (details)
  7. jogl: change code generation for Debug pipelines to avoid building large (details)
  8. jogl: do not generate an extra String for the Debug pipeline wrappers (details)
  9. jogl: save on class size in the Debug pipelines (details)
  10. jogl: pass format and arguments directly to the printGLError function (details)
  11. Fix Bug 866 - Frequent IndexOutOfBoundsException in (details)
  12. MacOSXJAWTWindow.CALayer DEBUG: Only Dump AWT location-on-screen if (details)
  13. jogl: add final to Debug wrapper error code and fix indentation (details)
  14. jogl: indent trace statements in the Trace pipelines when we hit glBegin (details)
  15. GLContext CTX_IMPL_* bits: Use 10 cached bits (+1), and 6 uncached (-1) (details)
  16. jogl: add generic annotations to the packed rectangle utility package (details)
  17. jogl: add generics annotations to lists in the waveout code (details)
  18. Bug 867 - OSX 10.9: Recognize OpenGL Core Profile > 3.0 - Add (details)
  19. Bug 871 - Add optional xcode.clang support for all modules (Extends Bug (details)
  20. Bug 867 - OSX: Allow core >=4 if isMavericksOrLater; Use (details)
  21. Bug 867 OSX [Common Code]: Trigger GLRendererQuirks.GL4NeedsGL3Request (details)
  22. Use org.junit.Assert instead of deprecated junit.framework.Assert (details)
  23. Fix GLContext: getGLProfile() add missing GLES3; (details)
  24. JoglVersion: "Default Profiles on device" -> "GLProfiles on device" - (details)
  25. GLProfile: Fix native profile mapping, i.e. use actual mapped (details)
  26. Fix regression of commit 34b35c5a0a379a6b4c0b23b9d347a0b1338f0239 - (details)
  27. Fix Bug 872: ES3 and ES3-GLSL Version not properly Handled (details)
  28. TestGLProfile00NEWT: Dump Desktop's and EGL's default-device GLProfiles (details)
Commit 946e0b59847de43d3dd51080abe7b9703d431e5f by Harvey Harrison
jogl: replce more unneeded String() construction

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/jogamp/opengl/util/av/impl/OMXGLMediaPlayer.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/glsl/sdk/CompileShader.java (diff)
The file was modifiedsrc/nativewindow/classes/com/jogamp/nativewindow/awt/DirectDataBufferInt.java (diff)
Commit 2e13993b57061e897889a3a6f4a1d44a19c32d11 by Harvey Harrison
jogl: remove clone() method that only throws Exceptions

commit:
a4e3f241cfba55e407c68eba91ffcc4beb0758b5 (Analysis of glXMakeCurrent freeze on ATI fglrx 8.78.6; Misc ..)

Removed 'implements Clonable' from NamedDisplay, which means Object.clone() will
always throw CloneNotSupportedException. Kill clone().

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java (diff)
Commit 873a34debe0870c4ecd7aa646f92a18b2efc7ce8 by Harvey Harrison
jogl: remove clone() version that can only ever fail

commit:
d75835796900cac602f7e5789601ffba0a27efe2 (Graph: More std. functionality (equals, clone) / Better in-place transformation (cubic -> quadratic))

Added a clone method, but did not implement Cloneable, meaning Object.clone() will
always throw CloneNotSupportedException.  This method never returns anythng but null.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/graph/curve/OutlineShape.java (diff)
Commit 6d841a02d084142e2f90333a420cd39af1188d80 by Harvey Harrison
jogl: enable generics annotations on TextRenderer

These were already here, enable them.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java (diff)
Commit aba59607bc738361dd81c5cd5362ad0ec322b441 by Harvey Harrison
jogl: adapt code generator to output @Override annotations in various places

This adds the @Override to methods in the GL implementations (debug, trace, etc) for methods
implementing a GL Profile.  It also adds @Override for the toString() method.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit 27f6fce2e629e421793eaeb0e09cb6c10d9c0aa1 by Harvey Harrison
jogl: use .format() to build the method signature when generating pipeline code

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit c1bb679c5d6d36e91c146d5e075e093bc83a07f1 by Harvey Harrison
jogl: change code generation for Debug pipelines to avoid building large strings

- split the check for a GL error from the output of the error string
- only build the caller String when there is an error to report
- wrap String building in an if() block rather than using an early return as we
don't know the return type in the postDownstreamCallHook

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit cf0d18c7b82801f41f6fe30f5d09b6a0a9546893 by Harvey Harrison
jogl: do not generate an extra String for the Debug pipeline wrappers

Build the caller string directly and don't wrap it in an extra constructor.

Update the indentation level for the newly added if-block from the previous commit.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit 7fd9174afe73ae2a61af9a6d101afb7f21bb608b by Harvey Harrison
jogl: save on class size in the Debug pipelines

Using a format String and arg list produces smaller class files for the Debug classes
as many of the format strings are identical and shared.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit fa865a86033f64309b777dec7f557376f7f0eb46 by Harvey Harrison
jogl: pass format and arguments directly to the printGLError function

This saves us a bit more code size as the String.format is now in the common
helper rather than in every GL wrapper function.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit 1f8a46cf71d5ecd9b8d649ccb09ccf986c48b960 by Sven Gothel
Fix Bug 866 - Frequent IndexOutOfBoundsException in jogamp.opengl.egl.EGLGraphicsConfigurationFactory: Add missing 'else' in branch
The file was modifiedsrc/jogl/classes/jogamp/opengl/egl/EGLGraphicsConfigurationFactory.java (diff)
Commit 5a79f9138d3aa72ce683f790988bc686cd87e2e1 by Sven Gothel
MacOSXJAWTWindow.CALayer DEBUG: Only Dump AWT location-on-screen if property DEBUG_CALAYER_POS_CRITICAL is explicitly set.

- DEBUG_CALAYER_POS_CRITICAL = nativewindow.debug.JAWT.OSXCALayerPos

Since AWT's location-on-screen query can cause an AWT deadlock,
which is the sole purpose of our custom lock-free impl,
don't enable it's DEBUG output w/ default DEBUG flags.
The file was modifiedsrc/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java (diff)
Commit 0e79445985e23f0ff8c600137052cc446af421be by Harvey Harrison
jogl: add final to Debug wrapper error code and fix indentation

Make the indentation consistent in each function wrapper.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit b77bd2e9de054124ef81413aa338c635dbdc5a54 by Harvey Harrison
jogl: indent trace statements in the Trace pipelines when we hit glBegin

The indent was being reduced on glEnd/glEndList but was never being incremented.
The intent appeared to be to indent all statements between glBEgin/glEnd pairs to
show the nested context of those calls.  Add the increment after printing the glBegin
trace statement.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/gluegen/opengl/BuildComposablePipeline.java (diff)
Commit 3647f6ad5ee3bc490a5647aee2de8d02119dd46c by Sven Gothel
GLContext CTX_IMPL_* bits: Use 10 cached bits (+1), and 6 uncached (-1) ; CTX_IMPL_FP32_COMPAT_API: "FP32 compat-api" -> "FP32 compat"
The file was modifiedsrc/jogl/classes/javax/media/opengl/GLContext.java (diff)
Commit ee9d26c28589a25329ebd26ee6f714db0eedd092 by Harvey Harrison
jogl: add generic annotations to the packed rectangle utility package

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/packrect/LevelSet.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java (diff)
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/packrect/Level.java (diff)
Commit 445e6117edb0ce3545d01065a067fb7a751db030 by Harvey Harrison
jogl: add generics annotations to lists in the waveout code

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
The file was modifiedsrc/jogl/classes/com/jogamp/audio/windows/waveout/Mixer.java (diff)
Commit 38025a602750161c72a50ad7a25e97fb7a6cb6df by Sven Gothel
Bug 867 - OSX 10.9: Recognize OpenGL Core Profile > 3.0 - Add GLRendererQuirks: Quirk GL4NeedsGL3Request and 'sticky device quirks'

The 'sticky device quirks' are required to share quirks among devices
as collected while mapping the GL versions (audit).

Those are context independent and may only be detected for certain contexts.

They can be pushed/added to the context's quirks, but also queried at context
creation (after mapping) - before the local quirks are being created.
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/GLRendererQuirks.java (diff)
Commit 970c9823007d1618e67480440ff40e7802dbb90f by Sven Gothel
Bug 871 - Add optional xcode.clang support for all modules (Extends Bug 837 w/ xcode's xcrun) - Remove abs. include path.

#include </usr/include/machine/types.h> -> #include <machine/types.h>
The file was modifiedmake/config/jogl/cgl-macosx.cfg (diff)
The file was modifiedmake/config/jogl/gl-headers.cfg (diff)
The file was modifiedmake/config/nativewindow/jawt-macosx.cfg (diff)
The file was modifiedmake/config/jogl/glu-gl2.cfg (diff)
The file was modifiedsrc/jogl/native/macosx/MacOSXCustomCGLCode.c (diff)
The file was modifiedmake/config/jogl/gl3-headers.cfg (diff)
Commit cbc641e89136098e0a9e79afe74b45203f828587 by Sven Gothel
Bug 867 - OSX: Allow core >=4 if isMavericksOrLater; Use [kCGLOGLPVersion_GL4_Core, kCGLOGLPVersion_GL3_Core] for major==4 depending on sticky GLRendererQuirks.GL4NeedsGL3Request
The file was modifiedmake/stub_includes/macosx/OpenGL/OpenGL.h (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLGraphicsConfiguration.java (diff)
Commit dc2deb071ca192594426791e95804a208e030ce3 by Sven Gothel
Bug 867 OSX [Common Code]: Trigger GLRendererQuirks.GL4NeedsGL3Request and make it sticky; Only alias profiles if HW-Accelerated!

Only alias profiles if HW-Accelerated!
GLContextImpl.mapGLVersions(..) shall not map a higher profile to a lower if it is a software renderer.

+++

GLContextImpl.mapGLVersions(..) attempts to trigger GLRendererQuirks.GL4NeedsGL3Request if OSX 10.9
by creating a GL3 core context first.

+++

GLContextImpl.setGLFunctionAvailability():
  - On OSX 10.9: Detect GLRendererQuirks.GL4NeedsGL3Request and make it sticky (per device)
    while 'withinGLVersionsMapping'

  - Merge sticky quirks w/ local quirks

+++

TestGearsES2NEWT: Add cmdline '-gl2' to force GL2 profile.
The file was modifiedsrc/jogl/classes/jogamp/opengl/GLContextImpl.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/egl/EGLExternalContext.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/windows/wgl/WindowsExternalWGLContext.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/egl/EGLContext.java (diff)
The file was modifiedmake/scripts/tests.sh (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/x11/glx/X11GLXContext.java (diff)
The file was modifiedsrc/jogl/classes/jogamp/opengl/x11/glx/X11ExternalGLXContext.java (diff)
Commit f8b21903cf0db85fdc16c8e1892003702a05a33f by Sven Gothel
Use org.junit.Assert instead of deprecated junit.framework.Assert
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug675BeansInDesignTimeAWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageNEWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug572AWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug692GL3VAO.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageAWT.java (diff)
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java (diff)
Commit e1ffbf2ae6eb837dc1576eedaacbbb68247139f2 by Sven Gothel
Fix GLContext: getGLProfile() add missing GLES3; getAvailableGLProfile(device, ..) shall use GLProfile.get(device, ..)
The file was modifiedsrc/jogl/classes/jogamp/opengl/GLContextImpl.java (diff)
The file was modifiedsrc/jogl/classes/javax/media/opengl/GLContext.java (diff)
Commit 4050d0a319e88d4795cdefd1fd84789430adc1a2 by Sven Gothel
JoglVersion: "Default Profiles on device" -> "GLProfiles on device" - Since we do use the named device
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/JoglVersion.java (diff)
Commit 7b6fe9e4d26b4d3ff2a9ffac12523bcd29196db0 by Sven Gothel
GLProfile: Fix native profile mapping, i.e. use actual mapped profile-impl as detected and mapped by GLContext ; Enhance glAvailabilityToString(..)

We shall not map profile == profile-impl, i.e. GL3 -> GL3,
but use GLContext.getAvailableGLProfileName(device, reqMajor, reqProfileBits).
The latter reflects the actual mapped context as detected.

glAvailabilityToString(..)
  - Partition result in [Natives, Common and Mappings]

  - Mappings dumps mapped keys to profiles, while excluding default.
    Default is added at last.

  - Add count.
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile00NEWT.java (diff)
The file was modifiedmake/scripts/tests.sh (diff)
The file was modifiedsrc/jogl/classes/javax/media/opengl/GLProfile.java (diff)
Commit ed47ed58374fe57e2d1db9b2d0af6e29595016dd by Sven Gothel
Fix regression of commit 34b35c5a0a379a6b4c0b23b9d347a0b1338f0239 - GLContextImpl.createContextARBVersions(..) erroneous upper bounds check.
The file was modifiedsrc/jogl/classes/jogamp/opengl/GLContextImpl.java (diff)
Commit 5ee57df0fab57124afb31bc65fd87e9184cf8f16 by Sven Gothel
Fix Bug 872: ES3 and ES3-GLSL Version not properly Handled

GLContext:
  - Proper API doc for Version* fields

  - getStaticGLSLVersionNumber(): ES3 -> Version300

  - hasGLSL(): Add ES3

ShaderCode:
  - addDefaultShaderPrecision():
    - ES2 default precision: Don't 'tune up' default precision for fragment shader, use 'mediump'
    - Add ES3 default precision (equal to ES2 default precision)

  - requiresDefaultPrecision(): Shall returns 'true' for ES3 as well!
The file was modifiedsrc/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java (diff)
The file was modifiedsrc/jogl/classes/javax/media/opengl/GLContext.java (diff)
Commit a444e03c8a346492de400b203d22f3f6c0067628 by Sven Gothel
TestGLProfile00NEWT: Dump Desktop's and EGL's default-device GLProfiles
The file was modifiedsrc/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile00NEWT.java (diff)