Merge branch 'master' into stash_glyphcache

Conflicts:
	make/scripts/tests.sh
	src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
	src/jogl/classes/com/jogamp/graph/curve/Region.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
	src/jogl/classes/com/jogamp/graph/font/Font.java
	src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java

1 files changed, 86 insertions, 26 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index c8e5d212b..40f0d180f 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,12 +20,12 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
  */
- 
+
 package com.jogamp.opengl;
 
 import com.jogamp.common.GlueGenVersion;
@@ -90,19 +90,15 @@ public class JoglVersion extends JogampVersion {
             sb.append("\tnone").append(Platform.getNewline());
         }
         sb.append(Platform.getNewline());
-        return sb;        
+        return sb;
     }
-    
-    public static StringBuilder getDefaultOpenGLInfo(StringBuilder sb) {
+
+    public static StringBuilder getAllAvailableCapabilitiesInfo(AbstractGraphicsDevice device, StringBuilder sb) {
         if(null==sb) {
             sb = new StringBuilder();
         }
-        final AbstractGraphicsDevice device = GLProfile.getDefaultDevice();
-        sb.append("Default Profiles     ").append(Platform.getNewline());
-        if(null!=device) {
-            GLProfile.glAvailabilityToString(device, sb, "\t", 1);
-        } else {
-            sb.append("none");
+        if(null == device) {
+            device = GLProfile.getDefaultDevice();
         }
         sb.append(Platform.getNewline()).append(Platform.getNewline());
         sb.append("Desktop Capabilities: ").append(Platform.getNewline());
@@ -111,52 +107,116 @@ public class JoglVersion extends JogampVersion {
         getAvailableCapabilitiesInfo(GLDrawableFactory.getEGLFactory(), device, sb);
         return sb;
     }
-    
+
+    public static StringBuilder getDefaultOpenGLInfo(AbstractGraphicsDevice device, StringBuilder sb, boolean withCapabilitiesInfo) {
+        if(null==sb) {
+            sb = new StringBuilder();
+        }
+        if(null == device) {
+            device = GLProfile.getDefaultDevice();
+        }
+        sb.append("GLProfiles on device ").append(device).append(Platform.getNewline());
+        if(null!=device) {
+            GLProfile.glAvailabilityToString(device, sb, "\t", 1);
+        } else {
+            sb.append("none");
+        }
+        if(withCapabilitiesInfo) {
+            sb = getAllAvailableCapabilitiesInfo(device, sb);
+        }
+        return sb;
+    }
+
     public static StringBuilder getGLInfo(GL gl, StringBuilder sb) {
+        return getGLInfo(gl, sb, false);
+    }
+    public static StringBuilder getGLInfo(GL gl, StringBuilder sb, boolean withCapabilitiesAndExtensionInfo) {
         AbstractGraphicsDevice device = gl.getContext().getGLDrawable().getNativeSurface()
                                             .getGraphicsConfiguration().getScreen().getDevice();
         if(null==sb) {
             sb = new StringBuilder();
         }
-        GLContext ctx = gl.getContext();
 
         sb.append(VersionUtil.SEPERATOR).append(Platform.getNewline());
         sb.append(device.getClass().getSimpleName()).append("[type ")
                 .append(device.getType()).append(", connection ").append(device.getConnection()).append("]: ").append(Platform.getNewline());
-        GLProfile.glAvailabilityToString(device, sb, "\t", 1);        
+        GLProfile.glAvailabilityToString(device, sb, "\t", 1);
         sb.append(Platform.getNewline());
+
+        sb = getGLStrings(gl, sb, withCapabilitiesAndExtensionInfo);
+
+        if( withCapabilitiesAndExtensionInfo ) {
+            sb = getAllAvailableCapabilitiesInfo(device, sb);
+        }
+        return sb;
+    }
+
+    public static StringBuilder getGLStrings(GL gl, StringBuilder sb) {
+        return getGLStrings(gl, sb, true);
+    }
+
+    public static StringBuilder getGLStrings(GL gl, StringBuilder sb, boolean withExtensions) {
+        if(null==sb) {
+            sb = new StringBuilder();
+        }
+        final GLContext ctx = gl.getContext();
         sb.append("Swap Interval  ").append(gl.getSwapInterval());
         sb.append(Platform.getNewline());
         sb.append("GL Profile     ").append(gl.getGLProfile());
         sb.append(Platform.getNewline());
-        sb.append("CTX VERSION    ").append(gl.getContext().getGLVersion());
+        sb.append("GL Version     ").append(ctx.getGLVersion()).append(" [GL ").append(ctx.getGLVersionNumber()).append(", vendor ").append(ctx.getGLVendorVersionNumber()).append("]");
         sb.append(Platform.getNewline());
-        sb.append("GL             ").append(gl);
+        sb.append("Quirks         ").append(ctx.getRendererQuirks());
+        sb.append(Platform.getNewline());
+        sb.append("Impl. class    ").append(gl.getClass().getCanonicalName());
         sb.append(Platform.getNewline());
         sb.append("GL_VENDOR      ").append(gl.glGetString(GL.GL_VENDOR));
         sb.append(Platform.getNewline());
         sb.append("GL_RENDERER    ").append(gl.glGetString(GL.GL_RENDERER));
         sb.append(Platform.getNewline());
         sb.append("GL_VERSION     ").append(gl.glGetString(GL.GL_VERSION));
-        sb.append(Platform.getNewline());        
-        sb.append("GLSL           ").append(gl.hasGLSL()).append(", has-compiler: ").append(gl.isFunctionAvailable("glCompileShader"));
+        sb.append(Platform.getNewline());
+        sb.append("GLSL           ").append(gl.hasGLSL()).append(", has-compiler-func: ").append(gl.isFunctionAvailable("glCompileShader"));
         if(gl.hasGLSL()) {
-            sb.append(", version: ").append(gl.glGetString(GL2ES2.GL_SHADING_LANGUAGE_VERSION));
+            sb.append(", version: ").append(gl.glGetString(GL2ES2.GL_SHADING_LANGUAGE_VERSION)).append(" / ").append(ctx.getGLSLVersionNumber());
         }
         sb.append(Platform.getNewline());
-        sb.append("GL_EXTENSIONS  ").append(ctx.getGLExtensionCount());
+        sb.append("GL FBO: basic ").append(gl.hasBasicFBOSupport()).append(", full ").append(gl.hasFullFBOSupport());
         sb.append(Platform.getNewline());
-        sb.append("               ").append(ctx.getGLExtensionsString());
+        sb.append("GL_EXTENSIONS  ").append(ctx.getGLExtensionCount());
         sb.append(Platform.getNewline());
+        if( withExtensions ) {
+            sb.append("               ").append(ctx.getGLExtensionsString());
+            sb.append(Platform.getNewline());
+        }
         sb.append("GLX_EXTENSIONS ").append(ctx.getPlatformExtensionCount());
         sb.append(Platform.getNewline());
-        sb.append("               ").append(ctx.getPlatformExtensionsString());
-        sb.append(Platform.getNewline());
+        if( withExtensions ) {
+            sb.append("               ").append(ctx.getPlatformExtensionsString());
+            sb.append(Platform.getNewline());
+        }
         sb.append(VersionUtil.SEPERATOR);
 
         return sb;
     }
 
+    public StringBuilder getBriefOSGLBuildInfo(GL gl, StringBuilder sb) {
+        if(null==sb) {
+            sb = new StringBuilder();
+        }
+        sb.append("OS: ").append(Platform.getOSName()).append(", version ").append(Platform.getOSVersion()).append(", arch ").append(Platform.getArchName());
+        sb.append(Platform.getNewline());
+        sb.append("GL_VENDOR     ").append(gl.glGetString(GL.GL_VENDOR));
+        sb.append(Platform.getNewline());
+        sb.append("GL_RENDERER   ").append(gl.glGetString(GL.GL_RENDERER));
+        sb.append(Platform.getNewline());
+        sb.append("GL_VERSION    ").append(gl.glGetString(GL.GL_VERSION));
+        sb.append(Platform.getNewline());
+        sb.append("JOGL GIT sha1 ").append(getImplementationCommit());
+        sb.append(Platform.getNewline());
+        return sb;
+    }
+
     public static void main(String args[]) {
         System.err.println(VersionUtil.getPlatformInfo());
         System.err.println(GlueGenVersion.getInstance());