Changeset 1690Tweet

Timestamp:

Aug 2, 2012, 11:23:09 PM (9 years ago)

Author:

sam

Message:

gpu: try to patch some simple GLSL shaders on the fly so that they
work on OpenGL ES contexts.

Location:

trunk

Files:

• src/easymesh/shiny.lolfx (modified) (3 diffs)
• src/gpu/shader.cpp (modified) (7 diffs)
• tutorial/11_fractal.lolfx (modified) (2 diffs)

trunk/src/easymesh/shiny.lolfx

@@ -1 +1 @@
 
 -- GLSL.Vert --
-#if defined GL_ES
-#version 100
-#else
 #version 120
-#endif
 
 attribute vec3 in_Vertex;
@@ -14 +10 @@
 uniform mat4 in_Proj;
 uniform mat3 in_NormalMat;
-uniform vec3 in_LightDir = vec3(0.3, 0.3, 0.7);
+// FIXME: the light direction should be passed in the code
+vec3 in_LightDir = vec3(0.3, 0.3, 0.7);
 uniform float in_Damage;
 
@@ -54 +51 @@
 
 -- GLSL.Frag --
-#if defined GL_ES
-#version 100
-#else
 #version 120
-#endif
 
 #if defined GL_ES

trunk/src/gpu/shader.cpp

@@ -217 +217 @@
         Log::Error("shader source:\n%s\n", buf);
     }
-    else if (len > 1)
+    else if (len > 16)
     {
         Log::Debug("compile log for vertex shader: %s", errbuf);
@@ -261 +261 @@
         Log::Error("shader source:\n%s\n", buf);
     }
-    else if (len > 1)
+    else if (len > 16)
     {
         Log::Debug("compile log for fragment shader: %s", errbuf);
@@ -309 +309 @@
         Log::Error("failed to link program: %s", errbuf);
     }
-    else if (len > 1)
+    else if (len > 16)
     {
         Log::Debug("link log for program: %s", errbuf);
@@ -611 +611 @@
     if (!version)
     {
+#if defined HAVE_GLES_2X
+        /* GLES 2.x supports #version 100, that's all. */
+        return 100;
+#else
         char buf[4096];
         GLsizei len;
@@ -644 +648 @@
 
         glDeleteShader(id);
+#endif
     }
 #endif
@@ -651 +656 @@
 
 /* Simple shader source patching for old GLSL versions.
- * If supported version is 1.30, do nothing.
- * If supported version is 1.20:
- *  - replace "#version 130" with "#version 120"
  */
 void ShaderData::Patch(char *dst, char const *vert, char const *frag)
@@ -667 +669 @@
     if (parser)
         ver_shader = atoi(parser + strlen("#version"));
+
+    /* This is GL ES, we only know version 100. */
+    if (ver_shader > 100 && ver_driver == 100)
+    {
+        /* FIXME: this isn't elegant but honestly, we don't care, this
+         * whole file is going to die soon. */
+        char *p = strstr(dst, "#version");
+        if (p)
+        {
+            p += 8;
+            while (*p == ' ')
+                p++;
+            if (p[0] == '1' && p[1] && p[2])
+                p[1] = p[2] = '0';
+        }
+    }
 
     if (ver_shader > 120 && ver_driver <= 120)

trunk/tutorial/11_fractal.lolfx

@@ -3 +3 @@
 #version 120
 
-#if defined HAVE_GLES_2X
+#if defined GL_ES
 precision highp float;
 #endif
@@ -54 +54 @@
 #version 120
 
-#if defined HAVE_GLES_2X
+#if defined GL_ES
 precision highp float;
 #endif