Use GLSL 3.0 ES for all shaders

diff --git a/shaders/mandelwow.frag b/shaders/mandelwow.frag
index 0551a342450b982d2e5522243da7812f9ac79bad..8107b3d86e24424be5ba45e0d6dfb6e14b8a7009 100644 (file)
--- a/shaders/mandelwow.frag
+++ b/shaders/mandelwow.frag
@@ -1,7 +1,8 @@
-#version 100
+#version 300 es
 precision highp float;
-varying vec2 c;
-varying vec2 z;
+in vec2 c;
+in vec2 z;
+out vec4 color;
 
 void main() {
     float zx = z.x;
@@ -12,14 +13,14 @@ void main() {
         float zy2 = zy * zy;
         if (zx2 * zy2 > 4.0) {
           float index = float(iter) / float(maxiter);
-          gl_FragColor = vec4(index, 0.1, 1.0 - index / 2.0, 0.8 - index * index);
+          color = vec4(index, 0.1, 1.0 - index / 2.0, 0.8 - index * index);
           return;
         }
         zy = zx * zy * 2.0 + c.y;
         zx = zx2 - zy2 + c.x;
     }
-    gl_FragColor = vec4((sin(z.y) + 1.0) / 4.0,
-                        (sin(z.x) + 1.0) / 4.0,
-                        (sin(c.x) + 1.0) / 4.0,
-                        1.0);
+    color = vec4((sin(z.y) + 1.0) / 4.0,
+                 (sin(z.x) + 1.0) / 4.0,
+                 (sin(c.x) + 1.0) / 4.0,
+                 1.0);
 }

diff --git a/shaders/mandelwow.vert b/shaders/mandelwow.vert
index 0e67eda0dbe0978125073f164f24143c9409d779..b7556a72d8b5c2618c03153779a9bff35cd1b198 100644 (file)
--- a/shaders/mandelwow.vert
+++ b/shaders/mandelwow.vert
@@ -1,11 +1,12 @@
-#version 100
+#version 300 es
+precision lowp float;
 uniform mat4 perspective;
 uniform mat4 view;
 uniform mat4 model;
 uniform vec2 z0;
-attribute mediump vec3 position;
-varying mediump vec2 c;
-varying mediump vec2 z;
+in vec3 position;
+out vec2 c;
+out vec2 z;
 
 void main() {
     mat4 modelview = view * model;

diff --git a/shaders/text.frag b/shaders/text.frag
index ab43bfee2fb7d1d4efcb6aa1b74bc04e254d3224..3df3010bb7688d074034f79a8dc8fb2129c49ead 100644 (file)
--- a/shaders/text.frag
+++ b/shaders/text.frag
@@ -1,4 +1,4 @@
-#version 140
+#version 300 es
 uniform sampler2D tex;
 uniform vec4 bgcolor;
 uniform vec4 fgcolor;

diff --git a/shaders/text.vert b/shaders/text.vert
index e3544f72e99a5cf510113c4260d055b0b8204799..90e0b9f5a7da517585fd2d3e60e9bed4ba2b431c 100644 (file)
--- a/shaders/text.vert
+++ b/shaders/text.vert
@@ -1,4 +1,4 @@
-#version 140
+#version 300 es
 
 uniform mat4 model;
 uniform mat4 perspview;