summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/graph/curve/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes/jogamp/graph/curve/opengl')
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl3
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp8
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.vp6
3 files changed, 12 insertions, 5 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;
}