From e1f2ad1f7602194452fe8a2f3ade3d3bf1818835 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 20 Feb 2010 04:49:03 +0000 Subject: [PATCH] and merge some delcaration lines for compactness SVN revision: 46328 --- .../evas/src/modules/engines/gl_common/shader/yuv_frag.h | 4 +--- .../src/modules/engines/gl_common/shader/yuv_frag.shd | 4 +--- .../src/modules/engines/gl_common/shader/yuv_nomul_frag.h | 4 +--- .../modules/engines/gl_common/shader/yuv_nomul_frag.shd | 4 +--- .../src/modules/engines/gl_common/shader/yuv_nomul_vert.h | 8 ++------ .../modules/engines/gl_common/shader/yuv_nomul_vert.shd | 8 ++------ .../evas/src/modules/engines/gl_common/shader/yuv_vert.h | 8 ++------ .../src/modules/engines/gl_common/shader/yuv_vert.shd | 8 ++------ 8 files changed, 12 insertions(+), 36 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h b/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h index 7cf817d97c..f02d0bea54 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h @@ -3,9 +3,7 @@ "#endif\n" "uniform sampler2D tex, texu, texv;\n" "varying vec4 col;\n" -"varying vec2 tex_c;\n" -"varying vec2 tex_c2;\n" -"varying vec2 tex_c3;\n" +"varying vec2 tex_c, tex_c2, tex_c3;\n" "void main()\n" "{\n" " const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd b/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd index e91fa8f5e1..a00cd6f037 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd @@ -3,9 +3,7 @@ precision mediump float; #endif uniform sampler2D tex, texu, texv; varying vec4 col; -varying vec2 tex_c; -varying vec2 tex_c2; -varying vec2 tex_c3; +varying vec2 tex_c, tex_c2, tex_c3; void main() { const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h index e811b01c87..9eeda6837f 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h @@ -2,9 +2,7 @@ "precision mediump float;\n" "#endif\n" "uniform sampler2D tex, texu, texv;\n" -"varying vec2 tex_c;\n" -"varying vec2 tex_c2;\n" -"varying vec2 tex_c3;\n" +"varying vec2 tex_c, tex_c2, tex_c3;\n" "void main()\n" "{\n" " const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd index 835de48403..3c2592d0de 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd @@ -2,9 +2,7 @@ precision mediump float; #endif uniform sampler2D tex, texu, texv; -varying vec2 tex_c; -varying vec2 tex_c2; -varying vec2 tex_c3; +varying vec2 tex_c, tex_c2, tex_c3; void main() { const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h index a2fcb54327..8907f30ee7 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h @@ -2,13 +2,9 @@ "precision mediump float;\n" "#endif\n" "attribute vec4 vertex;\n" -"attribute vec2 tex_coord;\n" -"attribute vec2 tex_coord2;\n" -"attribute vec2 tex_coord3;\n" +"attribute vec2 tex_coord, tex_coord2, tex_coord3;\n" "uniform mat4 mvp;\n" -"varying vec2 tex_c;\n" -"varying vec2 tex_c2;\n" -"varying vec2 tex_c3;\n" +"varying vec2 tex_c, tex_c2, tex_c3;\n" "void main()\n" "{\n" " gl_Position = mvp * vertex;\n" diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd index 0575f74be7..24b04e4cae 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd @@ -2,13 +2,9 @@ precision mediump float; #endif attribute vec4 vertex; -attribute vec2 tex_coord; -attribute vec2 tex_coord2; -attribute vec2 tex_coord3; +attribute vec2 tex_coord, tex_coord2, tex_coord3; uniform mat4 mvp; -varying vec2 tex_c; -varying vec2 tex_c2; -varying vec2 tex_c3; +varying vec2 tex_c, tex_c2, tex_c3; void main() { gl_Position = mvp * vertex; diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h b/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h index 5b82148d0e..53b08bf7f7 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h @@ -3,14 +3,10 @@ "#endif\n" "attribute vec4 vertex;\n" "attribute vec4 color;\n" -"attribute vec2 tex_coord;\n" -"attribute vec2 tex_coord2;\n" -"attribute vec2 tex_coord3;\n" +"attribute vec2 tex_coord, tex_coord2, tex_coord3;\n" "uniform mat4 mvp;\n" "varying vec4 col;\n" -"varying vec2 tex_c;\n" -"varying vec2 tex_c2;\n" -"varying vec2 tex_c3;\n" +"varying vec2 tex_c, tex_c2, tex_c3;\n" "void main()\n" "{\n" " gl_Position = mvp * vertex;\n" diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd b/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd index b09477f20a..d69bf745d2 100644 --- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd +++ b/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd @@ -3,14 +3,10 @@ precision mediump float; #endif attribute vec4 vertex; attribute vec4 color; -attribute vec2 tex_coord; -attribute vec2 tex_coord2; -attribute vec2 tex_coord3; +attribute vec2 tex_coord, tex_coord2, tex_coord3; uniform mat4 mvp; varying vec4 col; -varying vec2 tex_c; -varying vec2 tex_c2; -varying vec2 tex_c3; +varying vec2 tex_c, tex_c2, tex_c3; void main() { gl_Position = mvp * vertex;