oh and compile script missing updates to make shd's... grrr. and nv12

shader bad!

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@63832 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/modules/engines/gl_common/shader/compile-sgx.sh b/src/modules/engines/gl_common/shader/compile-sgx.sh
index cb5d8ff..a052fac 100755 (executable)
--- a/src/modules/engines/gl_common/shader/compile-sgx.sh
+++ b/src/modules/engines/gl_common/shader/compile-sgx.sh
@@ -3,8 +3,15 @@ function compile()
 {
   F=$1
 
-  make-c-str.sh $F"_frag.shd" > $F"_frag.h"
-  make-c-str.sh $F"_vert.shd" > $F"_vert.h"
+  if [ -f $F".shd" ]; then
+    make-c-str.sh $F".shd" > $F".h"
+  fi
+  if [ -f $F"_frag.shd" ]; then
+    make-c-str.sh $F"_frag.shd" > $F"_frag.h"
+  fi
+  if [ -f $F"_vert.shd" ]; then
+    make-c-str.sh $F"_vert.shd" > $F"_vert.h"
+  fi
 }
 
 compile rect
@@ -18,4 +25,24 @@ compile yuv
 compile yuv_nomul
 compile tex
 compile tex_nomul
+compile filter_blur_bgra
+compile filter_blur_bgra_nomul
+compile filter_blur
+compile filter_blur_nomul
+compile filter_greyscale_bgra
+compile filter_greyscale_bgra_nomul
+compile filter_greyscale
+compile filter_greyscale_nomul
+compile filter_invert_bgra
+compile filter_invert_bgra_nomul
+compile filter_invert
+compile filter_invert_nomul
+compile filter_sepia_bgra
+compile filter_sepia_bgra_nomul
+compile filter_sepia
+compile filter_sepia_nomul
+compile nv12
+compile nv12_nomul
+compile yuy2
+compile yuy2_nomul
 ## FIXME: compile filter_*

diff --git a/src/modules/engines/gl_common/shader/filter_blur.h b/src/modules/engines/gl_common/shader/filter_blur.h
index 69e8c07..51b3ce9 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_blur.h
+++ b/src/modules/engines/gl_common/shader/filter_blur.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "uniform sampler1D gaussian;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_blur_bgra.h b/src/modules/engines/gl_common/shader/filter_blur_bgra.h
index 4dc5f37..2051881 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_blur_bgra.h
+++ b/src/modules/engines/gl_common/shader/filter_blur_bgra.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "uniform sampler1D gaussian;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h b/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h
index 4dc5f37..2051881 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "uniform sampler1D gaussian;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_blur_nomul.h b/src/modules/engines/gl_common/shader/filter_blur_nomul.h
index 4dc5f37..2051881 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_blur_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_blur_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "uniform sampler1D gaussian;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_blur_vert.h b/src/modules/engines/gl_common/shader/filter_blur_vert.h
index ed13d77..d38f412 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_blur_vert.h
+++ b/src/modules/engines/gl_common/shader/filter_blur_vert.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "attribute vec4 vertex;\n"
 "attribute vec4 color;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_greyscale.h b/src/modules/engines/gl_common/shader/filter_greyscale.h
index 7bb1b7b..b3e1ad7 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_greyscale.h
+++ b/src/modules/engines/gl_common/shader/filter_greyscale.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h b/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h
index e29c26a..b36ca91 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h
+++ b/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h b/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
index 687670a..4f19676 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec2 tex_c;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h b/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h
index 1de16b9..0bab164 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec2 tex_c;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_invert.h b/src/modules/engines/gl_common/shader/filter_invert.h
index 2b5268a..6b1fca4 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_invert.h
+++ b/src/modules/engines/gl_common/shader/filter_invert.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_invert_bgra.h b/src/modules/engines/gl_common/shader/filter_invert_bgra.h
index 6ab298d..7181f19 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_invert_bgra.h
+++ b/src/modules/engines/gl_common/shader/filter_invert_bgra.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h b/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h
index b0d0d53..6981e76 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_invert_nomul.h b/src/modules/engines/gl_common/shader/filter_invert_nomul.h
index 2b5268a..6b1fca4 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_invert_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_invert_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_sepia.h b/src/modules/engines/gl_common/shader/filter_sepia.h
index 821c824..d143a12 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_sepia.h
+++ b/src/modules/engines/gl_common/shader/filter_sepia.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_sepia_bgra.h b/src/modules/engines/gl_common/shader/filter_sepia_bgra.h
index 66f88d3..9507bb6 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_sepia_bgra.h
+++ b/src/modules/engines/gl_common/shader/filter_sepia_bgra.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h b/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h
index 6990485..57ddcfd 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/filter_sepia_nomul.h b/src/modules/engines/gl_common/shader/filter_sepia_nomul.h
index ba4621c..2ea5396 100644 (file)
--- a/src/modules/engines/gl_common/shader/filter_sepia_nomul.h
+++ b/src/modules/engines/gl_common/shader/filter_sepia_nomul.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/nv12_frag.h b/src/modules/engines/gl_common/shader/nv12_frag.h
index 7473cdf..97aec78 100644 (file)
--- a/src/modules/engines/gl_common/shader/nv12_frag.h
+++ b/src/modules/engines/gl_common/shader/nv12_frag.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex, texuv;\n"
 "varying vec4 col;\n"

diff --git a/src/modules/engines/gl_common/shader/nv12_nomul_frag.h b/src/modules/engines/gl_common/shader/nv12_nomul_frag.h
index 521c451..c98d041 100644 (file)
--- a/src/modules/engines/gl_common/shader/nv12_nomul_frag.h
+++ b/src/modules/engines/gl_common/shader/nv12_nomul_frag.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex, texuv;\n"
 "varying vec2 tex_c, tex_cuv;\n"

diff --git a/src/modules/engines/gl_common/shader/nv12_nomul_vert.h b/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
index 21304c2..889b5ca 100644 (file)
--- a/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
+++ b/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
@@ -1,14 +1,14 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "attribute vec4 vertex;\n"
 "attribute vec4 color;\n"
 "attribute vec2 tex_coord, tex_coord2;\n"
 "uniform mat4 mvp;\n"
-"varying vec2 tex_c, tex_cuv;\n"
+"varying vec2 tex_y, tex_cuv;\n"
 "void main()\n"
 "{\n"
 "   gl_Position = mvp * vertex;\n"
-"   tex_c = tex_coord;\n"
-"   tex_cuv = tex_coord2 * 0.5;\n"
+"   tex_y = tex_coord;\n"
+"   tex_cuv = tex_coord2;\n"
 "}\n"

diff --git a/src/modules/engines/gl_common/shader/nv12_vert.h b/src/modules/engines/gl_common/shader/nv12_vert.h
index 6b3fea7..3e4f013 100644 (file)
--- a/src/modules/engines/gl_common/shader/nv12_vert.h
+++ b/src/modules/engines/gl_common/shader/nv12_vert.h
@@ -1,16 +1,16 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "attribute vec4 vertex;\n"
 "attribute vec4 color;\n"
 "attribute vec2 tex_coord, tex_coord2;\n"
 "uniform mat4 mvp;\n"
 "varying vec4 col;\n"
-"varying vec2 tex_c, tex_cuv;\n"
+"varying vec2 tex_y, tex_cuv;\n"
 "void main()\n"
 "{\n"
 "   gl_Position = mvp * vertex;\n"
 "   col = color;\n"
-"   tex_c = tex_coord;\n"
-"   tex_cuv = tex_coord2 * 0.5;\n"
+"   tex_y = tex_coord;\n"
+"   tex_cuv = tex_coord2;\n"
 "}\n"

diff --git a/src/modules/engines/gl_common/shader/yuy2_frag.h b/src/modules/engines/gl_common/shader/yuy2_frag.h
index f431607..546c83c 100644 (file)
--- a/src/modules/engines/gl_common/shader/yuy2_frag.h
+++ b/src/modules/engines/gl_common/shader/yuy2_frag.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex, texuv;\n"
 "varying vec4 col;\n"
@@ -10,17 +10,17 @@
 "  y=texture2D(tex,tex_c).r;\n"
 "  u=texture2D(texuv,tex_cuv).g;\n"
 "  v=texture2D(texuv,tex_cuv).a;\n"
-
+"\n"
 "  u=u-0.5;\n"
 "  v=v-0.5;\n"
 "  vmu=v*0.813+u*0.391;\n"
 "  u=u*2.018;\n"
 "  v=v*1.596;\n"
-
+"\n"
 "  r=y+v;\n"
 "  g=y-vmu;\n"
 "  b=y+u;\n"
-
+"\n"
 "  gl_FragColor=vec4(r,g,b,1.0) * col;\n"
 "}\n"
-
+"\n"

diff --git a/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h b/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h
index 69c2dec..c49596a 100644 (file)
--- a/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h
+++ b/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "uniform sampler2D tex, texuv;\n"
 "varying vec2 tex_c, tex_cuv;\n"
@@ -9,18 +9,18 @@
 "  y=texture2D(tex,tex_c).r;\n"
 "  u=texture2D(texuv,tex_cuv).g;\n"
 "  v=texture2D(texuv,tex_cuv).a;\n"
-
+"\n"
 "  u=u-0.5;\n"
 "  v=v-0.5;\n"
 "  vmu=v*0.813+u*0.391;\n"
 "  u=u*2.018;\n"
 "  v=v*1.596;\n"
 "  y=(y-0.062)*1.164;\n"
-
+"\n"
 "  r=y+v;\n"
 "  g=y-vmu;\n"
 "  b=y+u;\n"
-
+"\n"
 "  gl_FragColor=vec4(r,g,b,1.0);\n"
 "}\n"
-
+"\n"

diff --git a/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h b/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h
index 75ae0c5..4620b66 100644 (file)
--- a/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h
+++ b/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "attribute vec4 vertex;\n"
 "attribute vec2 tex_coord, tex_coord2;\n"

diff --git a/src/modules/engines/gl_common/shader/yuy2_vert.h b/src/modules/engines/gl_common/shader/yuy2_vert.h
index a2ec64a..1e49018 100644 (file)
--- a/src/modules/engines/gl_common/shader/yuy2_vert.h
+++ b/src/modules/engines/gl_common/shader/yuy2_vert.h
@@ -1,5 +1,5 @@
 "#ifdef GL_ES\n"
-"precision mediump float;\n"
+"precision highp float;\n"
 "#endif\n"
 "attribute vec4 vertex;\n"
 "attribute vec4 color;\n"