1 files changed, 62 insertions, 37 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
index 40c052498..5cd384c58 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
@@ -1,21 +1,21 @@
 /*
  * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  * - Redistribution of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
- * 
+ *
  * - Redistribution 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.
- * 
+ *
  * Neither the name of Sun Microsystems, Inc. or the names of
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * This software is provided "AS IS," without a warranty of any kind. ALL
  * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
  * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
@@ -28,7 +28,7 @@
  * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
  * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
+ *
  */
 
 package com.jogamp.opengl.util.glsl;
@@ -40,6 +40,7 @@ import java.util.*;
 import javax.media.opengl.*;
 
 import com.jogamp.common.nio.Buffers;
+import com.jogamp.opengl.GLExtensions;
 
 public class ShaderUtil {
     public static String getShaderInfoLog(GL _gl, int shaderObj) {
@@ -116,11 +117,11 @@ public class ShaderUtil {
         }
         return true;
     }
-    
+
     /**
      * Performs {@link GL2ES2#glValidateProgram(int)}
      * <p>
-     * One shall only call this method while debugging and only if all required 
+     * One shall only call this method while debugging and only if all required
      * resources by the shader are set.
      * </p>
      * <p>
@@ -149,7 +150,7 @@ public class ShaderUtil {
     }
 
     /**
-     * If supported, queries the natively supported shader binary formats using 
+     * If supported, queries the natively supported shader binary formats using
      * {@link GL2ES2#GL_NUM_SHADER_BINARY_FORMATS} and {@link GL2ES2#GL_SHADER_BINARY_FORMATS}
      * via {@link GL2ES2#glGetIntegerv(int, int[], int)}.
      */
@@ -159,15 +160,21 @@ public class ShaderUtil {
         if(null == info.shaderBinaryFormats) {
             info.shaderBinaryFormats = new HashSet<Integer>();
             if (gl.isGLES2Compatible()) {
-                final int[] param = new int[1];
-                gl.glGetIntegerv(GL2ES2.GL_NUM_SHADER_BINARY_FORMATS, param, 0);
-                int numFormats = param[0];
-                if(numFormats>0) {
-                    int[] formats = new int[numFormats];
-                    gl.glGetIntegerv(GL2ES2.GL_SHADER_BINARY_FORMATS, formats, 0);
-                    for(int i=0; i<numFormats; i++) {
-                        info.shaderBinaryFormats.add(new Integer(formats[i]));
+                try {
+                    final int[] param = new int[1];
+                    gl.glGetIntegerv(GL2ES2.GL_NUM_SHADER_BINARY_FORMATS, param, 0);
+                    final int err = gl.glGetError();
+                    final int numFormats = GL.GL_NO_ERROR == err ? param[0] : 0;
+                    if(numFormats>0) {
+                        int[] formats = new int[numFormats];
+                        gl.glGetIntegerv(GL2ES2.GL_SHADER_BINARY_FORMATS, formats, 0);
+                        for(int i=0; i<numFormats; i++) {
+                            info.shaderBinaryFormats.add(new Integer(formats[i]));
+                        }
                     }
+                } catch (GLException gle) {
+                    System.err.println("Catched Exception on thread "+Thread.currentThread().getName());
+                    gle.printStackTrace();
                 }
             }
         }
@@ -180,17 +187,28 @@ public class ShaderUtil {
         final ProfileInformation info = getProfileInformation(gl);
         if(null==info.shaderCompilerAvailable) {
             if(gl.isGLES2()) {
-                final byte[] param = new byte[1];
-                gl.glGetBooleanv(GL2ES2.GL_SHADER_COMPILER, param, 0);
-                boolean v = param[0]!=(byte)0x00;
-                if(!v) {
-                    final Set<Integer> bfs = getShaderBinaryFormats(gl);
-                    if(bfs.size()==0) {
-                        // no supported binary formats, hence a compiler must be available!
-                        v = true;
+                boolean queryOK = false;
+                try {
+                    final byte[] param = new byte[1];
+                    gl.glGetBooleanv(GL2ES2.GL_SHADER_COMPILER, param, 0);
+                    final int err = gl.glGetError();
+                    boolean v = GL.GL_NO_ERROR == err && param[0]!=(byte)0x00;
+                    if(!v) {
+                        final Set<Integer> bfs = getShaderBinaryFormats(gl);
+                        if(bfs.size()==0) {
+                            // no supported binary formats, hence a compiler must be available!
+                            v = true;
+                        }
                     }
+                    info.shaderCompilerAvailable = new Boolean(v);
+                    queryOK = true;
+                } catch (GLException gle) {
+                    System.err.println("Catched Exception on thread "+Thread.currentThread().getName());
+                    gle.printStackTrace();
+                }
+                if(!queryOK) {
+                    info.shaderCompilerAvailable = new Boolean(true);
                 }
-                info.shaderCompilerAvailable = new Boolean(v);
             } else if( gl.isGL2ES2() ) {
                 info.shaderCompilerAvailable = new Boolean(true);
             } else {
@@ -200,6 +218,13 @@ public class ShaderUtil {
         return info.shaderCompilerAvailable.booleanValue();
     }
 
+    /** Returns true if GeometryShader is supported, i.e. whether GLContext is &ge; 3.2 or ARB_geometry_shader4 extension is available. */
+    public static boolean isGeometryShaderSupported(GL _gl) {
+      final GLContext ctx = _gl.getContext();
+      return ctx.getGLVersionNumber().compareTo(GLContext.Version320) >= 0 ||
+             ctx.isExtensionAvailable(GLExtensions.ARB_geometry_shader4);
+    }
+
     public static void shaderSource(GL _gl, int shader, CharSequence[] source)
     {
         final GL2ES2 gl = _gl.getGL2ES2();
@@ -215,7 +240,7 @@ public class ShaderUtil {
         IntBuffer lengths = Buffers.newDirectIntBuffer(count);
         for(int i=0; i<count; i++) {
             lengths.put(i, source[i].length());
-        }        
+        }
         if(source instanceof String[]) {
             // rare case ..
             gl.glShaderSource(shader, count, (String[])source, lengths);
@@ -224,10 +249,10 @@ public class ShaderUtil {
             for(int i = source.length - 1; i>=0; i--) {
                 final CharSequence csq = source[i];
                 if(csq instanceof String) {
-                    // if ShaderCode.create(.. mutableStringBuffer == false )
+                    // if ShaderCode.create(.. mutableStringBuilder == false )
                     tmp[i] = (String) csq;
                 } else {
-                    // if ShaderCode.create(.. mutableStringBuffer == true )
+                    // if ShaderCode.create(.. mutableStringBuilder == true )
                     tmp[i] = source[i].toString();
                 }
             }
@@ -313,7 +338,7 @@ public class ShaderUtil {
         }
 
         createShader(gl, shaderType, shader);
-        err = gl.glGetError(); 
+        err = gl.glGetError();
         if(err!=GL.GL_NO_ERROR) {
             throw new GLException("createAndLoadShader: CreateShader failed, GL Error: 0x"+Integer.toHexString(err));
         }
@@ -328,7 +353,7 @@ public class ShaderUtil {
     }
 
     public static boolean createAndCompileShader(GL _gl, IntBuffer shader, int shaderType,
-                                                 CharSequence[][] sources, 
+                                                 CharSequence[][] sources,
                                                  PrintStream verboseOut)
     {
         final GL2ES2 gl = _gl.getGL2ES2();
@@ -338,32 +363,32 @@ public class ShaderUtil {
         }
 
         createShader(gl, shaderType, shader);
-        err = gl.glGetError(); 
+        err = gl.glGetError();
         if(err!=GL.GL_NO_ERROR) {
             throw new GLException("createAndCompileShader: CreateShader failed, GL Error: 0x"+Integer.toHexString(err));
         }
 
         shaderSource(gl, shader, sources);
-        err = gl.glGetError(); 
+        err = gl.glGetError();
         if(err!=GL.GL_NO_ERROR) {
             throw new GLException("createAndCompileShader: ShaderSource failed, GL Error: 0x"+Integer.toHexString(err));
         }
 
         compileShader(gl, shader);
-        err = gl.glGetError(); 
+        err = gl.glGetError();
         if(err!=GL.GL_NO_ERROR && null!=verboseOut) {
             verboseOut.println("createAndCompileShader: CompileShader failed, GL Error: 0x"+Integer.toHexString(err));
         }
 
         return isShaderStatusValid(gl, shader, GL2ES2.GL_COMPILE_STATUS, verboseOut) && err == GL.GL_NO_ERROR;
     }
-    
+
     private static final String implObjectKey = "com.jogamp.opengl.util.glsl.ShaderUtil" ;
-    
+
     private static class ProfileInformation {
         Boolean shaderCompilerAvailable = null;
         Set<Integer> shaderBinaryFormats = null;
-    }    
+    }
 
     private static ProfileInformation getProfileInformation(GL gl) {
         final GLContext context = gl.getContext();