aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2015-01-19 12:13:37 +0100
committerSylvain Munaut <tnt@246tNt.com>2015-01-19 14:16:25 +0100
commit720e702ee9e13b5427d1b07d075e91a22193933b (patch)
treec6a2231a6eca8e2f2749d3bbf09d30a2a788ab14
parent95bb75593af23f6b44ad16fed7ee1620773f0b83 (diff)
fosphor/shaders: Use GLSL 1.3 instead of "1.5 compatibility"
I originally used 1.5 compatibility because it still allows immediate mode / fixed pipeline without warning. But Intel Cards on linux and OSX in general don't implement it. Using 1.3 works fine since I don't need anything more recent, but if you display the compilation results, it will for a deprecation warning. Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--lib/fosphor/cmap_bicubic.glsl9
-rw-r--r--lib/fosphor/cmap_simple.glsl9
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/fosphor/cmap_bicubic.glsl b/lib/fosphor/cmap_bicubic.glsl
index 2b80586..e16aa0a 100644
--- a/lib/fosphor/cmap_bicubic.glsl
+++ b/lib/fosphor/cmap_bicubic.glsl
@@ -23,8 +23,13 @@
* a derivative work (i.e. "a work based on the program").
*/
-/* Require GLSL 1.5 compatibility profile */
-#version 150 compatibility
+/* Require GLSL 1.5 compatibility profile to build without warning
+ * But we use 1.3 since some cards don't allow 1.5 compatibility but
+ * will work with 1.3
+ */
+
+/* #version 150 compatibility */
+#version 130
/* ------------------------------------------------------------------------ */
diff --git a/lib/fosphor/cmap_simple.glsl b/lib/fosphor/cmap_simple.glsl
index 3315b41..db09001 100644
--- a/lib/fosphor/cmap_simple.glsl
+++ b/lib/fosphor/cmap_simple.glsl
@@ -23,8 +23,13 @@
* a derivative work (i.e. "a work based on the program").
*/
-/* Require GLSL 1.5 compatibility profile */
-#version 150 compatibility
+/* Require GLSL 1.5 compatibility profile to build without warning
+ * But we use 1.3 since some cards don't allow 1.5 compatibility but
+ * will work with 1.3
+ */
+
+/* #version 150 compatibility */
+#version 130
/* ------------------------------------------------------------------------ */