From 27431cacdd4ab55621776f50b63b50aed22cea64 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 5 Oct 2011 09:52:08 +0000 Subject: [PATCH] oh and compile script missing updates to make shd's... grrr. and nv12 shader bad! SVN revision: 63832 --- .../engines/gl_common/shader/compile-sgx.sh | 31 +++++++++++++++++-- .../engines/gl_common/shader/filter_blur.h | 2 +- .../gl_common/shader/filter_blur_bgra.h | 2 +- .../gl_common/shader/filter_blur_bgra_nomul.h | 2 +- .../gl_common/shader/filter_blur_nomul.h | 2 +- .../gl_common/shader/filter_blur_vert.h | 2 +- .../gl_common/shader/filter_greyscale.h | 2 +- .../gl_common/shader/filter_greyscale_bgra.h | 2 +- .../shader/filter_greyscale_bgra_nomul.h | 2 +- .../gl_common/shader/filter_greyscale_nomul.h | 2 +- .../engines/gl_common/shader/filter_invert.h | 2 +- .../gl_common/shader/filter_invert_bgra.h | 2 +- .../shader/filter_invert_bgra_nomul.h | 2 +- .../gl_common/shader/filter_invert_nomul.h | 2 +- .../engines/gl_common/shader/filter_sepia.h | 2 +- .../gl_common/shader/filter_sepia_bgra.h | 2 +- .../shader/filter_sepia_bgra_nomul.h | 2 +- .../gl_common/shader/filter_sepia_nomul.h | 2 +- .../engines/gl_common/shader/nv12_frag.h | 2 +- .../gl_common/shader/nv12_nomul_frag.h | 2 +- .../gl_common/shader/nv12_nomul_vert.h | 8 ++--- .../engines/gl_common/shader/nv12_vert.h | 8 ++--- .../engines/gl_common/shader/yuy2_frag.h | 10 +++--- .../gl_common/shader/yuy2_nomul_frag.h | 10 +++--- .../gl_common/shader/yuy2_nomul_vert.h | 2 +- .../engines/gl_common/shader/yuy2_vert.h | 2 +- 26 files changed, 68 insertions(+), 41 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/shader/compile-sgx.sh b/legacy/evas/src/modules/engines/gl_common/shader/compile-sgx.sh index cb5d8ff4dc..a052fac557 100755 --- a/legacy/evas/src/modules/engines/gl_common/shader/compile-sgx.sh +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h index 69e8c07084..51b3ce9d21 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h index 4dc5f37c90..2051881e26 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h index 4dc5f37c90..2051881e26 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h index 4dc5f37c90..2051881e26 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h index ed13d77a6a..d38f4127f6 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h index 7bb1b7b7ab..b3e1ad7ee7 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h index e29c26abc1..b36ca91959 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h index 687670aa42..4f196760dd 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h index 1de16b967a..0bab1644b1 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h index 2b5268ab00..6b1fca4e88 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h index 6ab298da3b..7181f19c70 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h index b0d0d531ff..6981e76e96 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h index 2b5268ab00..6b1fca4e88 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h index 821c8245c1..d143a1261a 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h index 66f88d322f..9507bb6c22 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h index 69904850dd..57ddcfd87d 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h b/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h index ba4621cab0..2ea5396468 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h b/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h index 7473cdfa1f..97aec787fc 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h b/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h index 521c4515bb..c98d0415b3 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h index 21304c2a89..889b5cabba 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h index 6b3fea7f79..3e4f01309d 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h b/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h index f431607a26..546c83c0dd 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h b/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h index 69c2decceb..c49596a9b0 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h index 75ae0c5748..4620b66166 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h +++ b/legacy/evas/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/legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.h index a2ec64a55e..1e490183f9 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.h +++ b/legacy/evas/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"