Graph: Fix AMD shader complain (version) ; No Attributes in fragment program ; Disable FPS draw at start

5 files changed, 15 insertions, 6 deletions

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl b/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl
index e5ae2b42e..c9a242573 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl
@@ -4,7 +4,8 @@
 
 #include precision.glsl
 
-attribute HIGHP vec3    gca_Vertices;
+// attribute HIGHP vec3    gca_Vertices;
+attribute HIGHP vec4    gca_Vertices;
 attribute HIGHP vec2    gca_TexCoords;
 //attribute HIGHP vec4    gca_Colors;
 //attribute HIGHP vec3    gca_Normals;
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp
index fca3bcc04..975c2dc5b 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp
@@ -1,13 +1,15 @@
 //Copyright 2010 JogAmp Community. All rights reserved.
 
+/**
+ * AMD complains: #version must occur before any other statement in the program
 #ifdef GL_ES
     #version 100
 #else
-    #version 130
+    #version 110
 #endif
-
+ */
+ 
 #include uniforms.glsl
-#include attributes.glsl
 #include varyings.glsl
 
 const vec3 b_color = vec3(0.0, 0.0, 0.0);
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.vp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.vp
index 298dce7ef..fe74caffb 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.vp
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.vp
@@ -1,10 +1,13 @@
 //Copyright 2010 JogAmp Community. All rights reserved.
 
+/**
+ * AMD complains: #version must occur before any other statement in the program
 #ifdef GL_ES
     #version 100
 #else
     #version 110
 #endif
+ */
 
 #include uniforms.glsl
 #include attributes.glsl
@@ -12,6 +15,7 @@
 
 void main(void)
 {
-  gl_Position = gcu_PMVMatrix[0] * gcu_PMVMatrix[1] * vec4(gca_Vertices, 1);
+  // gl_Position = gcu_PMVMatrix[0] * gcu_PMVMatrix[1] * vec4(gca_Vertices, 1);
+  gl_Position = gcu_PMVMatrix[0] * gcu_PMVMatrix[1] * gca_Vertices;
   gcv_TexCoord = gca_TexCoords;
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
index b173c1f06..8a16113f5 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
@@ -107,6 +107,8 @@ public abstract class GPURendererListenerBase01 implements GLEventListener {
         if(trace) {
             gl = gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", null, gl, new Object[] { System.err } ) ).getGL2ES2();
         }
+        System.err.println("*** "+gl.getContext().getGLVersion());
+        System.err.println("*** GLDebugMessage "+gl.getContext().isGLDebugMessageEnabled());
         gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
     }
     
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java
index 119b38584..7da96c5ec 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java
@@ -65,7 +65,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
     Font font;
     
     int headType = 0;
-    boolean drawFPS = true;
+    boolean drawFPS = false;
     boolean updateFont = true;
     final int fontSizeFixed = 6;
     int fontSize = 40;