summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-02-12 14:56:03 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-02-12 15:01:39 +0900
commitcfd337a758ab379ebb6b89c6d8d8f8f8c8786c87 (patch)
treebe709d66d9aa723fdb285a9972f932af83cff406 /src
parent651f0ae2411cea5373bef091ac3b189adf98815a (diff)
Revert "Evas GL common: Use uniform instead of attribute for sample"
This reverts commit 986b60eaf0175b3592883c85cfb6f5f5a280f31d. Added PUSH_SAMPLE for simplicity. It was dumb of me to use uniforms, so I added a comment to prevent other dumb people from making the same mistake later.
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h5
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c56
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_shader.c2
-rw-r--r--src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x176
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_12_bgra_nomul_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_12_bgra_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_12_nomul_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_12_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_21_bgra_nomul_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_21_bgra_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_21_nomul_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_21_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_22_bgra_nomul_vert.shd10
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_22_bgra_vert.shd10
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_22_nomul_vert.shd10
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_22_vert.shd10
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_12_afill_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_12_nomul_afill_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_12_nomul_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_12_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_21_afill_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_21_nomul_afill_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_21_nomul_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_21_vert.shd6
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_22_afill_vert.shd10
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_22_nomul_afill_vert.shd10
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_22_nomul_vert.shd10
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_22_vert.shd10
28 files changed, 235 insertions, 180 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index c8c21973bf..8bb414bca4 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -276,7 +276,8 @@
276#define SHAD_TEXUV2 3 276#define SHAD_TEXUV2 3
277#define SHAD_TEXUV3 4 277#define SHAD_TEXUV3 4
278#define SHAD_TEXA 5 278#define SHAD_TEXA 5
279#define SHAD_TEXM 6 279#define SHAD_TEXSAM 6
280#define SHAD_TEXM 7
280 281
281typedef struct _Evas_GL_Program Evas_GL_Program; 282typedef struct _Evas_GL_Program Evas_GL_Program;
282typedef struct _Evas_GL_Program_Source Evas_GL_Program_Source; 283typedef struct _Evas_GL_Program_Source Evas_GL_Program_Source;
@@ -478,6 +479,7 @@ struct _Evas_Engine_GL_Context
478 GLfloat *texuv2; 479 GLfloat *texuv2;
479 GLfloat *texuv3; 480 GLfloat *texuv3;
480 GLfloat *texa; 481 GLfloat *texa;
482 GLfloat *texsam;
481 GLfloat *texm; 483 GLfloat *texm;
482 Eina_List *uniforms; /* Evas_GL_Uniform */ 484 Eina_List *uniforms; /* Evas_GL_Uniform */
483 Eina_Bool line: 1; 485 Eina_Bool line: 1;
@@ -487,6 +489,7 @@ struct _Evas_Engine_GL_Context
487 Eina_Bool use_texuv2 : 1; 489 Eina_Bool use_texuv2 : 1;
488 Eina_Bool use_texuv3 : 1; 490 Eina_Bool use_texuv3 : 1;
489 Eina_Bool use_texa : 1; 491 Eina_Bool use_texa : 1;
492 Eina_Bool use_texsam : 1;
490 Eina_Bool use_texm : 1; 493 Eina_Bool use_texm : 1;
491 Eina_Bool anti_alias : 1; 494 Eina_Bool anti_alias : 1;
492 Evas_GL_Image *im; 495 Evas_GL_Image *im;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index c7b0bcda58..2b4e267515 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -928,6 +928,7 @@ evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
928 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa); 928 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa);
929 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2); 929 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
930 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3); 930 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
931 if (gc->pipe[i].array.texsam) free(gc->pipe[i].array.texsam);
931 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm); 932 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm);
932 } 933 }
933 } 934 }
@@ -1216,6 +1217,9 @@ evas_gl_common_context_target_surface_set(Evas_Engine_GL_Context *gc,
1216#define PUSH_TEXM(n, u, v) do { \ 1217#define PUSH_TEXM(n, u, v) do { \
1217 gc->pipe[n].array.texm[nm++] = u; \ 1218 gc->pipe[n].array.texm[nm++] = u; \
1218 gc->pipe[n].array.texm[nm++] = v; } while(0) 1219 gc->pipe[n].array.texm[nm++] = v; } while(0)
1220#define PUSH_TEXSAM(n, x, y) do { \
1221 gc->pipe[n].array.texsam[ns++] = x; \
1222 gc->pipe[n].array.texsam[ns++] = y; } while(0)
1219 1223
1220#define PUSH_6_VERTICES(pn, x, y, w, h) do { \ 1224#define PUSH_6_VERTICES(pn, x, y, w, h) do { \
1221 PUSH_VERTEX(pn, x , y , 0); PUSH_VERTEX(pn, x + w, y , 0); \ 1225 PUSH_VERTEX(pn, x , y , 0); PUSH_VERTEX(pn, x + w, y , 0); \
@@ -1238,6 +1242,10 @@ evas_gl_common_context_target_surface_set(Evas_Engine_GL_Context *gc,
1238 PUSH_TEXA(pn, x1, y1); PUSH_TEXA(pn, x2, y1); PUSH_TEXA(pn, x1, y2); \ 1242 PUSH_TEXA(pn, x1, y1); PUSH_TEXA(pn, x2, y1); PUSH_TEXA(pn, x1, y2); \
1239 PUSH_TEXA(pn, x2, y1); PUSH_TEXA(pn, x2, y2); PUSH_TEXA(pn, x1, y2); \ 1243 PUSH_TEXA(pn, x2, y1); PUSH_TEXA(pn, x2, y2); PUSH_TEXA(pn, x1, y2); \
1240 } while (0) 1244 } while (0)
1245#define PUSH_SAMPLES(pn, dx, dy) do { \
1246 PUSH_TEXSAM(pn, dx, dy); PUSH_TEXSAM(pn, dx, dy); PUSH_TEXSAM(pn, dx, dy); \
1247 PUSH_TEXSAM(pn, dx, dy); PUSH_TEXSAM(pn, dx, dy); PUSH_TEXSAM(pn, dx, dy); \
1248 } while (0)
1241#define PUSH_6_COLORS(pn, r, g, b, a) \ 1249#define PUSH_6_COLORS(pn, r, g, b, a) \
1242 do { int i; for (i = 0; i < 6; i++) PUSH_COLOR(pn, r, g, b, a); } while(0) 1250 do { int i; for (i = 0; i < 6; i++) PUSH_COLOR(pn, r, g, b, a); } while(0)
1243 1251
@@ -1283,6 +1291,7 @@ array_alloc(Evas_Engine_GL_Context *gc, int n)
1283 ALOC(texa, GLfloat, 2); 1291 ALOC(texa, GLfloat, 2);
1284 ALOC(texuv2, GLfloat, 2); 1292 ALOC(texuv2, GLfloat, 2);
1285 ALOC(texuv3, GLfloat, 2); 1293 ALOC(texuv3, GLfloat, 2);
1294 ALOC(texsam, GLfloat, 2);
1286 ALOC(texm, GLfloat, 2); 1295 ALOC(texm, GLfloat, 2);
1287 return; 1296 return;
1288 } 1297 }
@@ -1298,6 +1307,7 @@ array_alloc(Evas_Engine_GL_Context *gc, int n)
1298 RALOC(texa, GLfloat, 2); 1307 RALOC(texa, GLfloat, 2);
1299 RALOC(texuv2, GLfloat, 2); 1308 RALOC(texuv2, GLfloat, 2);
1300 RALOC(texuv3, GLfloat, 2); 1309 RALOC(texuv3, GLfloat, 2);
1310 RALOC(texsam, GLfloat, 2);
1301 RALOC(texm, GLfloat, 2); 1311 RALOC(texm, GLfloat, 2);
1302} 1312}
1303 1313
@@ -1641,6 +1651,7 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
1641 gc->pipe[pn].array.use_texuv2 = 0; 1651 gc->pipe[pn].array.use_texuv2 = 0;
1642 gc->pipe[pn].array.use_texuv3 = 0; 1652 gc->pipe[pn].array.use_texuv3 = 0;
1643 gc->pipe[pn].array.use_texa = 0; 1653 gc->pipe[pn].array.use_texa = 0;
1654 gc->pipe[pn].array.use_texsam = 0;
1644 gc->pipe[pn].array.use_texm = 0; 1655 gc->pipe[pn].array.use_texm = 0;
1645 1656
1646 PIPE_GROW(gc, pn, 2); 1657 PIPE_GROW(gc, pn, 2);
@@ -1661,6 +1672,7 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
1661 gc->pipe[pn].array.use_texuv2 = 0; 1672 gc->pipe[pn].array.use_texuv2 = 0;
1662 gc->pipe[pn].array.use_texuv3 = 0; 1673 gc->pipe[pn].array.use_texuv3 = 0;
1663 gc->pipe[pn].array.use_texa = 0; 1674 gc->pipe[pn].array.use_texa = 0;
1675 gc->pipe[pn].array.use_texsam = 0;
1664 gc->pipe[pn].array.use_texm = 0; 1676 gc->pipe[pn].array.use_texm = 0;
1665} 1677}
1666 1678
@@ -1713,6 +1725,7 @@ again:
1713 gc->pipe[pn].array.use_texuv2 = 0; 1725 gc->pipe[pn].array.use_texuv2 = 0;
1714 gc->pipe[pn].array.use_texuv3 = 0; 1726 gc->pipe[pn].array.use_texuv3 = 0;
1715 gc->pipe[pn].array.use_texa = 0; 1727 gc->pipe[pn].array.use_texa = 0;
1728 gc->pipe[pn].array.use_texsam = 0;
1716 gc->pipe[pn].array.use_texm = !!mtex; 1729 gc->pipe[pn].array.use_texm = !!mtex;
1717 } 1730 }
1718 else 1731 else
@@ -1764,6 +1777,7 @@ again:
1764 gc->pipe[pn].array.use_texuv2 = 0; 1777 gc->pipe[pn].array.use_texuv2 = 0;
1765 gc->pipe[pn].array.use_texuv3 = 0; 1778 gc->pipe[pn].array.use_texuv3 = 0;
1766 gc->pipe[pn].array.use_texa = 0; 1779 gc->pipe[pn].array.use_texa = 0;
1780 gc->pipe[pn].array.use_texsam = 0;
1767 gc->pipe[pn].array.use_texm = !!mtex; 1781 gc->pipe[pn].array.use_texm = !!mtex;
1768 } 1782 }
1769 } 1783 }
@@ -1799,6 +1813,7 @@ again:
1799 gc->pipe[pn].array.use_texuv2 = 0; 1813 gc->pipe[pn].array.use_texuv2 = 0;
1800 gc->pipe[pn].array.use_texuv3 = 0; 1814 gc->pipe[pn].array.use_texuv3 = 0;
1801 gc->pipe[pn].array.use_texa = 0; 1815 gc->pipe[pn].array.use_texa = 0;
1816 gc->pipe[pn].array.use_texsam = 0;
1802 gc->pipe[pn].array.use_texm = !!mtex; 1817 gc->pipe[pn].array.use_texm = !!mtex;
1803#endif 1818#endif
1804 1819
@@ -2044,6 +2059,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2044 gc->pipe[pn].array.use_texuv2 = 0; 2059 gc->pipe[pn].array.use_texuv2 = 0;
2045 gc->pipe[pn].array.use_texuv3 = 0; 2060 gc->pipe[pn].array.use_texuv3 = 0;
2046 gc->pipe[pn].array.use_texm = !!mtex; 2061 gc->pipe[pn].array.use_texm = !!mtex;
2062 gc->pipe[pn].array.use_texsam = sam;
2047 2063
2048 pipe_region_expand(gc, pn, x, y, w, h); 2064 pipe_region_expand(gc, pn, x, y, w, h);
2049 PIPE_GROW(gc, pn, 6); 2065 PIPE_GROW(gc, pn, 6);
@@ -2068,9 +2084,17 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2068 2084
2069 if (sam) 2085 if (sam)
2070 { 2086 {
2087 /* Note: Although these values look like constants (did anyone say
2088 * uniforms?), they are passed to the GLSL program as attributes so
2089 * that we can nicely pipe multiple glDrawArrays together by pushing
2090 * more vertices. Setting uniforms would break the whole concept of
2091 * piping commands into a single call to glDrawArrays.
2092 * Don't be as dumb as me and keep these vertices as is.
2093 * -- jpeg
2094 */
2071 double samx = (double)(sw) / (double)(tex->pt->w * w * 4); 2095 double samx = (double)(sw) / (double)(tex->pt->w * w * 4);
2072 double samy = (double)(sh) / (double)(tex->pt->h * h * 4); 2096 double samy = (double)(sh) / (double)(tex->pt->h * h * 4);
2073 PUSH_UNIFORM(pn, shader, EVAS_GL_UNIFORM_VEC2, sample, samx, samy); 2097 PUSH_SAMPLES(pn, samx, samy);
2074 } 2098 }
2075 2099
2076 PUSH_MASK(pn, mtex, mx, my, mw, mh); 2100 PUSH_MASK(pn, mtex, mx, my, mw, mh);
@@ -2123,6 +2147,7 @@ evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
2123 gc->pipe[pn].array.use_texuv2 = 0; 2147 gc->pipe[pn].array.use_texuv2 = 0;
2124 gc->pipe[pn].array.use_texuv3 = 0; 2148 gc->pipe[pn].array.use_texuv3 = 0;
2125 gc->pipe[pn].array.use_texm = !!mtex; 2149 gc->pipe[pn].array.use_texm = !!mtex;
2150 gc->pipe[pn].array.use_texsam = 0;
2126 2151
2127 pipe_region_expand(gc, pn, x, y, w, h); 2152 pipe_region_expand(gc, pn, x, y, w, h);
2128 PIPE_GROW(gc, pn, 6); 2153 PIPE_GROW(gc, pn, 6);
@@ -2201,6 +2226,7 @@ evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
2201 gc->pipe[pn].array.use_texuv2 = 1; 2226 gc->pipe[pn].array.use_texuv2 = 1;
2202 gc->pipe[pn].array.use_texuv3 = 1; 2227 gc->pipe[pn].array.use_texuv3 = 1;
2203 gc->pipe[pn].array.use_texm = !!mtex; 2228 gc->pipe[pn].array.use_texm = !!mtex;
2229 gc->pipe[pn].array.use_texsam = 0;
2204 2230
2205 pipe_region_expand(gc, pn, x, y, w, h); 2231 pipe_region_expand(gc, pn, x, y, w, h);
2206 PIPE_GROW(gc, pn, 6); 2232 PIPE_GROW(gc, pn, 6);
@@ -2275,6 +2301,7 @@ evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
2275 gc->pipe[pn].array.use_texuv2 = 1; 2301 gc->pipe[pn].array.use_texuv2 = 1;
2276 gc->pipe[pn].array.use_texuv3 = 0; 2302 gc->pipe[pn].array.use_texuv3 = 0;
2277 gc->pipe[pn].array.use_texm = !!mtex; 2303 gc->pipe[pn].array.use_texm = !!mtex;
2304 gc->pipe[pn].array.use_texsam = 0;
2278 2305
2279 pipe_region_expand(gc, pn, x, y, w, h); 2306 pipe_region_expand(gc, pn, x, y, w, h);
2280 PIPE_GROW(gc, pn, 6); 2307 PIPE_GROW(gc, pn, 6);
@@ -2350,6 +2377,7 @@ evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
2350 gc->pipe[pn].array.use_texuv2 = 1; 2377 gc->pipe[pn].array.use_texuv2 = 1;
2351 gc->pipe[pn].array.use_texuv3 = 0; 2378 gc->pipe[pn].array.use_texuv3 = 0;
2352 gc->pipe[pn].array.use_texm = !!mtex; 2379 gc->pipe[pn].array.use_texm = !!mtex;
2380 gc->pipe[pn].array.use_texsam = 0;
2353 2381
2354 pipe_region_expand(gc, pn, x, y, w, h); 2382 pipe_region_expand(gc, pn, x, y, w, h);
2355 PIPE_GROW(gc, pn, 6); 2383 PIPE_GROW(gc, pn, 6);
@@ -2430,6 +2458,7 @@ evas_gl_common_context_rgb_a_pair_push(Evas_Engine_GL_Context *gc,
2430 gc->pipe[pn].array.use_texuv2 = 0; 2458 gc->pipe[pn].array.use_texuv2 = 0;
2431 gc->pipe[pn].array.use_texuv3 = 0; 2459 gc->pipe[pn].array.use_texuv3 = 0;
2432 gc->pipe[pn].array.use_texa = EINA_TRUE; 2460 gc->pipe[pn].array.use_texa = EINA_TRUE;
2461 gc->pipe[pn].array.use_texsam = 0;
2433 gc->pipe[pn].array.use_texm = !!mtex; 2462 gc->pipe[pn].array.use_texm = !!mtex;
2434 2463
2435 pipe_region_expand(gc, pn, x, y, w, h); 2464 pipe_region_expand(gc, pn, x, y, w, h);
@@ -2660,6 +2689,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
2660 gc->pipe[pn].array.use_texuv3 = (utexture) ? 1 : 0; 2689 gc->pipe[pn].array.use_texuv3 = (utexture) ? 1 : 0;
2661 gc->pipe[pn].array.use_texm = !!mtex; 2690 gc->pipe[pn].array.use_texm = !!mtex;
2662 gc->pipe[pn].array.use_texa = 0; 2691 gc->pipe[pn].array.use_texa = 0;
2692 gc->pipe[pn].array.use_texsam = 0;
2663 2693
2664 pipe_region_expand(gc, pn, x, y, w, h); 2694 pipe_region_expand(gc, pn, x, y, w, h);
2665 PIPE_GROW(gc, pn, 6); 2695 PIPE_GROW(gc, pn, 6);
@@ -3078,6 +3108,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3078 unsigned char *texuv2_ptr = NULL; 3108 unsigned char *texuv2_ptr = NULL;
3079 unsigned char *texuv3_ptr = NULL; 3109 unsigned char *texuv3_ptr = NULL;
3080 unsigned char *texa_ptr = NULL; 3110 unsigned char *texa_ptr = NULL;
3111 unsigned char *texsam_ptr = NULL;
3081 unsigned char *texm_ptr = NULL; 3112 unsigned char *texm_ptr = NULL;
3082 3113
3083 if (glsym_glMapBuffer && glsym_glUnmapBuffer) 3114 if (glsym_glMapBuffer && glsym_glUnmapBuffer)
@@ -3093,7 +3124,8 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3093 texuv2_ptr = texuv_ptr + TEX_SIZE; 3124 texuv2_ptr = texuv_ptr + TEX_SIZE;
3094 texuv3_ptr = texuv2_ptr + TEX_SIZE; 3125 texuv3_ptr = texuv2_ptr + TEX_SIZE;
3095 texa_ptr = texuv3_ptr + TEX_SIZE; 3126 texa_ptr = texuv3_ptr + TEX_SIZE;
3096 texm_ptr = texa_ptr + TEX_SIZE; 3127 texsam_ptr = texa_ptr + TEX_SIZE;
3128 texm_ptr = texsam_ptr + TEX_SIZE;
3097# define END_POINTER (texm_ptr + TEX_SIZE) 3129# define END_POINTER (texm_ptr + TEX_SIZE)
3098 3130
3099 glBindBuffer(GL_ARRAY_BUFFER, gc->pipe[i].array.buffer); 3131 glBindBuffer(GL_ARRAY_BUFFER, gc->pipe[i].array.buffer);
@@ -3122,10 +3154,12 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3122 memcpy(x + (unsigned long)texuv3_ptr, gc->pipe[i].array.texuv3, TEX_SIZE); 3154 memcpy(x + (unsigned long)texuv3_ptr, gc->pipe[i].array.texuv3, TEX_SIZE);
3123 if (gc->pipe[i].array.use_texa) 3155 if (gc->pipe[i].array.use_texa)
3124 memcpy(x + (unsigned long)texa_ptr, gc->pipe[i].array.texa, TEX_SIZE); 3156 memcpy(x + (unsigned long)texa_ptr, gc->pipe[i].array.texa, TEX_SIZE);
3157 if (gc->pipe[i].array.use_texsam)
3158 memcpy(x + (unsigned long)texsam_ptr, gc->pipe[i].array.texsam, TEX_SIZE);
3125 if (gc->pipe[i].array.use_texm) 3159 if (gc->pipe[i].array.use_texm)
3126 memcpy(x + (unsigned long)texm_ptr, gc->pipe[i].array.texm, TEX_SIZE); 3160 memcpy(x + (unsigned long)texm_ptr, gc->pipe[i].array.texm, TEX_SIZE);
3127/* 3161/*
3128 fprintf(stderr, "copy %i bytes [%i/%i slots] [%i + %i + %i + %i + %i + %i + %i] <%i %i %i %i %i %i>\n", 3162 fprintf(stderr, "copy %i bytes [%i/%i slots] [%i + %i + %i + %i + %i + %i + %i] <%i %i %i %i %i %i %i>\n",
3129 (int)((unsigned char *)END_POINTER), 3163 (int)((unsigned char *)END_POINTER),
3130 gc->pipe[i].array.num, 3164 gc->pipe[i].array.num,
3131 gc->pipe[i].array.alloc, 3165 gc->pipe[i].array.alloc,
@@ -3136,6 +3170,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3136 gc->pipe[i].array.use_texuv2, 3170 gc->pipe[i].array.use_texuv2,
3137 gc->pipe[i].array.use_texuv3, 3171 gc->pipe[i].array.use_texuv3,
3138 gc->pipe[i].array.use_texa, 3172 gc->pipe[i].array.use_texa,
3173 gc->pipe[i].array.use_texsam,
3139 gc->pipe[i].array.use_texm); 3174 gc->pipe[i].array.use_texm);
3140 */ 3175 */
3141 glsym_glUnmapBuffer(GL_ARRAY_BUFFER); 3176 glsym_glUnmapBuffer(GL_ARRAY_BUFFER);
@@ -3150,6 +3185,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3150 texuv2_ptr = (unsigned char *)gc->pipe[i].array.texuv2; 3185 texuv2_ptr = (unsigned char *)gc->pipe[i].array.texuv2;
3151 texuv3_ptr = (unsigned char *)gc->pipe[i].array.texuv3; 3186 texuv3_ptr = (unsigned char *)gc->pipe[i].array.texuv3;
3152 texa_ptr = (unsigned char *)gc->pipe[i].array.texa; 3187 texa_ptr = (unsigned char *)gc->pipe[i].array.texa;
3188 texsam_ptr = (unsigned char *)gc->pipe[i].array.texsam;
3153 texm_ptr = (unsigned char *)gc->pipe[i].array.texm; 3189 texm_ptr = (unsigned char *)gc->pipe[i].array.texm;
3154 } 3190 }
3155 glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, (void *)vertex_ptr); 3191 glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, (void *)vertex_ptr);
@@ -3173,6 +3209,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3173 glDisableVertexAttribArray(SHAD_TEXUV2); 3209 glDisableVertexAttribArray(SHAD_TEXUV2);
3174 glDisableVertexAttribArray(SHAD_TEXUV3); 3210 glDisableVertexAttribArray(SHAD_TEXUV3);
3175 glDisableVertexAttribArray(SHAD_TEXA); 3211 glDisableVertexAttribArray(SHAD_TEXA);
3212 glDisableVertexAttribArray(SHAD_TEXSAM);
3176 glDisableVertexAttribArray(SHAD_TEXM); 3213 glDisableVertexAttribArray(SHAD_TEXM);
3177 glDrawArrays(GL_LINES, 0, gc->pipe[i].array.num); 3214 glDrawArrays(GL_LINES, 0, gc->pipe[i].array.num);
3178 } 3215 }
@@ -3225,6 +3262,16 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3225 glDisableVertexAttribArray(SHAD_TEXA); 3262 glDisableVertexAttribArray(SHAD_TEXA);
3226 } 3263 }
3227 3264
3265 if (gc->pipe[i].array.use_texsam)
3266 {
3267 glEnableVertexAttribArray(SHAD_TEXSAM);
3268 glVertexAttribPointer(SHAD_TEXSAM, 2, GL_FLOAT, GL_FALSE, 0, (void *)texsam_ptr);
3269 }
3270 else
3271 {
3272 glDisableVertexAttribArray(SHAD_TEXSAM);
3273 }
3274
3228 if ((gc->pipe[i].array.use_texuv2) && (gc->pipe[i].array.use_texuv3)) 3275 if ((gc->pipe[i].array.use_texuv2) && (gc->pipe[i].array.use_texuv3))
3229 { 3276 {
3230 glEnableVertexAttribArray(SHAD_TEXUV2); 3277 glEnableVertexAttribArray(SHAD_TEXUV2);
@@ -3374,6 +3421,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3374 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa); 3421 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa);
3375 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2); 3422 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
3376 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3); 3423 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
3424 if (gc->pipe[i].array.texsam) free(gc->pipe[i].array.texsam);
3377 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm); 3425 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm);
3378 3426
3379 gc->pipe[i].array.line = 0; 3427 gc->pipe[i].array.line = 0;
@@ -3383,6 +3431,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3383 gc->pipe[i].array.use_texuv2 = 0; 3431 gc->pipe[i].array.use_texuv2 = 0;
3384 gc->pipe[i].array.use_texuv3 = 0; 3432 gc->pipe[i].array.use_texuv3 = 0;
3385 gc->pipe[i].array.use_texa = 0; 3433 gc->pipe[i].array.use_texa = 0;
3434 gc->pipe[i].array.use_texsam = 0;
3386 gc->pipe[i].array.use_texm = 0; 3435 gc->pipe[i].array.use_texm = 0;
3387 3436
3388 gc->pipe[i].array.vertex = NULL; 3437 gc->pipe[i].array.vertex = NULL;
@@ -3391,6 +3440,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3391 gc->pipe[i].array.texa = NULL; 3440 gc->pipe[i].array.texa = NULL;
3392 gc->pipe[i].array.texuv2 = NULL; 3441 gc->pipe[i].array.texuv2 = NULL;
3393 gc->pipe[i].array.texuv3 = NULL; 3442 gc->pipe[i].array.texuv3 = NULL;
3443 gc->pipe[i].array.texsam = NULL;
3394 gc->pipe[i].array.texm = NULL; 3444 gc->pipe[i].array.texm = NULL;
3395 3445
3396 gc->pipe[i].array.num = 0; 3446 gc->pipe[i].array.num = 0;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index b181344ace..212dc858c5 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -82,6 +82,7 @@ _evas_gl_common_shader_program_binary_init(Evas_GL_Program *p,
82 glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2"); 82 glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2");
83 glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3"); 83 glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3");
84 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda"); 84 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda");
85 glBindAttribLocation(p->prog, SHAD_TEXSAM, "tex_sample");
85 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm"); 86 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm");
86 87
87 glGetProgramiv(p->prog, GL_LINK_STATUS, &ok); 88 glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
@@ -197,6 +198,7 @@ _evas_gl_common_shader_program_source_init(Evas_GL_Program *p,
197 glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2"); 198 glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2");
198 glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3"); 199 glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3");
199 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda"); 200 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda");
201 glBindAttribLocation(p->prog, SHAD_TEXSAM, "tex_sample");
200 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm"); 202 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm");
201 203
202 glLinkProgram(p->prog); 204 glLinkProgram(p->prog);
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
index 50ed71249f..712a84924e 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@@ -156,7 +156,7 @@ static const char const img_12_bgra_nomul_vert_glsl[] =
156 "#endif\n" 156 "#endif\n"
157 "attribute vec4 vertex;\n" 157 "attribute vec4 vertex;\n"
158 "attribute vec2 tex_coord;\n" 158 "attribute vec2 tex_coord;\n"
159 "uniform vec2 sample;\n" 159 "attribute vec2 tex_sample;\n"
160 "uniform mat4 mvp;\n" 160 "uniform mat4 mvp;\n"
161 "varying vec2 tex_c;\n" 161 "varying vec2 tex_c;\n"
162 "varying vec2 tex_s[2];\n" 162 "varying vec2 tex_s[2];\n"
@@ -165,8 +165,8 @@ static const char const img_12_bgra_nomul_vert_glsl[] =
165 "{\n" 165 "{\n"
166 " gl_Position = mvp * vertex;\n" 166 " gl_Position = mvp * vertex;\n"
167 " tex_c = tex_coord;\n" 167 " tex_c = tex_coord;\n"
168 " tex_s[0] = vec2(0, -sample.y);\n" 168 " tex_s[0] = vec2(0, -tex_sample.y);\n"
169 " tex_s[1] = vec2(0, sample.y);\n" 169 " tex_s[1] = vec2(0, tex_sample.y);\n"
170 " div_s = vec4(2, 2, 2, 2);\n" 170 " div_s = vec4(2, 2, 2, 2);\n"
171 "}\n"; 171 "}\n";
172Evas_GL_Program_Source shader_img_12_bgra_nomul_vert_src = 172Evas_GL_Program_Source shader_img_12_bgra_nomul_vert_src =
@@ -183,7 +183,7 @@ static const char const img_12_bgra_vert_glsl[] =
183 "attribute vec4 vertex;\n" 183 "attribute vec4 vertex;\n"
184 "attribute vec4 color;\n" 184 "attribute vec4 color;\n"
185 "attribute vec2 tex_coord;\n" 185 "attribute vec2 tex_coord;\n"
186 "uniform vec2 sample;\n" 186 "attribute vec2 tex_sample;\n"
187 "uniform mat4 mvp;\n" 187 "uniform mat4 mvp;\n"
188 "varying vec4 col;\n" 188 "varying vec4 col;\n"
189 "varying vec2 tex_c;\n" 189 "varying vec2 tex_c;\n"
@@ -194,8 +194,8 @@ static const char const img_12_bgra_vert_glsl[] =
194 " gl_Position = mvp * vertex;\n" 194 " gl_Position = mvp * vertex;\n"
195 " col = color;\n" 195 " col = color;\n"
196 " tex_c = tex_coord;\n" 196 " tex_c = tex_coord;\n"
197 " tex_s[0] = vec2(0, -sample.y);\n" 197 " tex_s[0] = vec2(0, -tex_sample.y);\n"
198 " tex_s[1] = vec2(0, sample.y);\n" 198 " tex_s[1] = vec2(0, tex_sample.y);\n"
199 " div_s = vec4(2, 2, 2, 2);\n" 199 " div_s = vec4(2, 2, 2, 2);\n"
200 "}\n"; 200 "}\n";
201Evas_GL_Program_Source shader_img_12_bgra_vert_src = 201Evas_GL_Program_Source shader_img_12_bgra_vert_src =
@@ -262,7 +262,7 @@ static const char const img_12_nomul_vert_glsl[] =
262 "#endif\n" 262 "#endif\n"
263 "attribute vec4 vertex;\n" 263 "attribute vec4 vertex;\n"
264 "attribute vec2 tex_coord;\n" 264 "attribute vec2 tex_coord;\n"
265 "uniform vec2 sample;\n" 265 "attribute vec2 tex_sample;\n"
266 "uniform mat4 mvp;\n" 266 "uniform mat4 mvp;\n"
267 "varying vec2 tex_c;\n" 267 "varying vec2 tex_c;\n"
268 "varying vec2 tex_s[2];\n" 268 "varying vec2 tex_s[2];\n"
@@ -271,8 +271,8 @@ static const char const img_12_nomul_vert_glsl[] =
271 "{\n" 271 "{\n"
272 " gl_Position = mvp * vertex;\n" 272 " gl_Position = mvp * vertex;\n"
273 " tex_c = tex_coord;\n" 273 " tex_c = tex_coord;\n"
274 " tex_s[0] = vec2(0, -sample.y);\n" 274 " tex_s[0] = vec2(0, -tex_sample.y);\n"
275 " tex_s[1] = vec2(0, sample.y);\n" 275 " tex_s[1] = vec2(0, tex_sample.y);\n"
276 " div_s = vec4(2, 2, 2, 2);\n" 276 " div_s = vec4(2, 2, 2, 2);\n"
277 "}\n"; 277 "}\n";
278Evas_GL_Program_Source shader_img_12_nomul_vert_src = 278Evas_GL_Program_Source shader_img_12_nomul_vert_src =
@@ -289,7 +289,7 @@ static const char const img_12_vert_glsl[] =
289 "attribute vec4 vertex;\n" 289 "attribute vec4 vertex;\n"
290 "attribute vec4 color;\n" 290 "attribute vec4 color;\n"
291 "attribute vec2 tex_coord;\n" 291 "attribute vec2 tex_coord;\n"
292 "uniform vec2 sample;\n" 292 "attribute vec2 tex_sample;\n"
293 "uniform mat4 mvp;\n" 293 "uniform mat4 mvp;\n"
294 "varying vec4 col;\n" 294 "varying vec4 col;\n"
295 "varying vec2 tex_c;\n" 295 "varying vec2 tex_c;\n"
@@ -300,8 +300,8 @@ static const char const img_12_vert_glsl[] =
300 " gl_Position = mvp * vertex;\n" 300 " gl_Position = mvp * vertex;\n"
301 " col = color;\n" 301 " col = color;\n"
302 " tex_c = tex_coord;\n" 302 " tex_c = tex_coord;\n"
303 " tex_s[0] = vec2(0, -sample.y);\n" 303 " tex_s[0] = vec2(0, -tex_sample.y);\n"
304 " tex_s[1] = vec2(0, sample.y);\n" 304 " tex_s[1] = vec2(0, tex_sample.y);\n"
305 " div_s = vec4(2, 2, 2, 2);\n" 305 " div_s = vec4(2, 2, 2, 2);\n"
306 "}\n"; 306 "}\n";
307Evas_GL_Program_Source shader_img_12_vert_src = 307Evas_GL_Program_Source shader_img_12_vert_src =
@@ -368,7 +368,7 @@ static const char const img_21_bgra_nomul_vert_glsl[] =
368 "#endif\n" 368 "#endif\n"
369 "attribute vec4 vertex;\n" 369 "attribute vec4 vertex;\n"
370 "attribute vec2 tex_coord;\n" 370 "attribute vec2 tex_coord;\n"
371 "uniform vec2 sample;\n" 371 "attribute vec2 tex_sample;\n"
372 "uniform mat4 mvp;\n" 372 "uniform mat4 mvp;\n"
373 "varying vec2 tex_c;\n" 373 "varying vec2 tex_c;\n"
374 "varying vec2 tex_s[2];\n" 374 "varying vec2 tex_s[2];\n"
@@ -377,8 +377,8 @@ static const char const img_21_bgra_nomul_vert_glsl[] =
377 "{\n" 377 "{\n"
378 " gl_Position = mvp * vertex;\n" 378 " gl_Position = mvp * vertex;\n"
379 " tex_c = tex_coord;\n" 379 " tex_c = tex_coord;\n"
380 " tex_s[0] = vec2(-sample.x, 0);\n" 380 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
381 " tex_s[1] = vec2( sample.x, 0);\n" 381 " tex_s[1] = vec2( tex_sample.x, 0);\n"
382 " div_s = vec4(2, 2, 2, 2);\n" 382 " div_s = vec4(2, 2, 2, 2);\n"
383 "}\n"; 383 "}\n";
384Evas_GL_Program_Source shader_img_21_bgra_nomul_vert_src = 384Evas_GL_Program_Source shader_img_21_bgra_nomul_vert_src =
@@ -395,7 +395,7 @@ static const char const img_21_bgra_vert_glsl[] =
395 "attribute vec4 vertex;\n" 395 "attribute vec4 vertex;\n"
396 "attribute vec4 color;\n" 396 "attribute vec4 color;\n"
397 "attribute vec2 tex_coord;\n" 397 "attribute vec2 tex_coord;\n"
398 "uniform vec2 sample;\n" 398 "attribute vec2 tex_sample;\n"
399 "uniform mat4 mvp;\n" 399 "uniform mat4 mvp;\n"
400 "varying vec4 col;\n" 400 "varying vec4 col;\n"
401 "varying vec2 tex_c;\n" 401 "varying vec2 tex_c;\n"
@@ -406,8 +406,8 @@ static const char const img_21_bgra_vert_glsl[] =
406 " gl_Position = mvp * vertex;\n" 406 " gl_Position = mvp * vertex;\n"
407 " col = color;\n" 407 " col = color;\n"
408 " tex_c = tex_coord;\n" 408 " tex_c = tex_coord;\n"
409 " tex_s[0] = vec2(-sample.x, 0);\n" 409 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
410 " tex_s[1] = vec2( sample.x, 0);\n" 410 " tex_s[1] = vec2( tex_sample.x, 0);\n"
411 " div_s = vec4(2, 2, 2, 2);\n" 411 " div_s = vec4(2, 2, 2, 2);\n"
412 "}\n"; 412 "}\n";
413Evas_GL_Program_Source shader_img_21_bgra_vert_src = 413Evas_GL_Program_Source shader_img_21_bgra_vert_src =
@@ -474,7 +474,7 @@ static const char const img_21_nomul_vert_glsl[] =
474 "#endif\n" 474 "#endif\n"
475 "attribute vec4 vertex;\n" 475 "attribute vec4 vertex;\n"
476 "attribute vec2 tex_coord;\n" 476 "attribute vec2 tex_coord;\n"
477 "uniform vec2 sample;\n" 477 "attribute vec2 tex_sample;\n"
478 "uniform mat4 mvp;\n" 478 "uniform mat4 mvp;\n"
479 "varying vec2 tex_c;\n" 479 "varying vec2 tex_c;\n"
480 "varying vec2 tex_s[2];\n" 480 "varying vec2 tex_s[2];\n"
@@ -483,8 +483,8 @@ static const char const img_21_nomul_vert_glsl[] =
483 "{\n" 483 "{\n"
484 " gl_Position = mvp * vertex;\n" 484 " gl_Position = mvp * vertex;\n"
485 " tex_c = tex_coord;\n" 485 " tex_c = tex_coord;\n"
486 " tex_s[0] = vec2(-sample.x, 0);\n" 486 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
487 " tex_s[1] = vec2( sample.x, 0);\n" 487 " tex_s[1] = vec2( tex_sample.x, 0);\n"
488 " div_s = vec4(2, 2, 2, 2);\n" 488 " div_s = vec4(2, 2, 2, 2);\n"
489 "}\n"; 489 "}\n";
490Evas_GL_Program_Source shader_img_21_nomul_vert_src = 490Evas_GL_Program_Source shader_img_21_nomul_vert_src =
@@ -501,7 +501,7 @@ static const char const img_21_vert_glsl[] =
501 "attribute vec4 vertex;\n" 501 "attribute vec4 vertex;\n"
502 "attribute vec4 color;\n" 502 "attribute vec4 color;\n"
503 "attribute vec2 tex_coord;\n" 503 "attribute vec2 tex_coord;\n"
504 "uniform vec2 sample;\n" 504 "attribute vec2 tex_sample;\n"
505 "uniform mat4 mvp;\n" 505 "uniform mat4 mvp;\n"
506 "varying vec4 col;\n" 506 "varying vec4 col;\n"
507 "varying vec2 tex_c;\n" 507 "varying vec2 tex_c;\n"
@@ -512,8 +512,8 @@ static const char const img_21_vert_glsl[] =
512 " gl_Position = mvp * vertex;\n" 512 " gl_Position = mvp * vertex;\n"
513 " col = color;\n" 513 " col = color;\n"
514 " tex_c = tex_coord;\n" 514 " tex_c = tex_coord;\n"
515 " tex_s[0] = vec2(-sample.x, 0);\n" 515 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
516 " tex_s[1] = vec2( sample.x, 0);\n" 516 " tex_s[1] = vec2( tex_sample.x, 0);\n"
517 " div_s = vec4(2, 2, 2, 2);\n" 517 " div_s = vec4(2, 2, 2, 2);\n"
518 "}\n"; 518 "}\n";
519Evas_GL_Program_Source shader_img_21_vert_src = 519Evas_GL_Program_Source shader_img_21_vert_src =
@@ -584,7 +584,7 @@ static const char const img_22_bgra_nomul_vert_glsl[] =
584 "#endif\n" 584 "#endif\n"
585 "attribute vec4 vertex;\n" 585 "attribute vec4 vertex;\n"
586 "attribute vec2 tex_coord;\n" 586 "attribute vec2 tex_coord;\n"
587 "uniform vec2 sample;\n" 587 "attribute vec2 tex_sample;\n"
588 "uniform mat4 mvp;\n" 588 "uniform mat4 mvp;\n"
589 "varying vec2 tex_c;\n" 589 "varying vec2 tex_c;\n"
590 "varying vec2 tex_s[4];\n" 590 "varying vec2 tex_s[4];\n"
@@ -593,10 +593,10 @@ static const char const img_22_bgra_nomul_vert_glsl[] =
593 "{\n" 593 "{\n"
594 " gl_Position = mvp * vertex;\n" 594 " gl_Position = mvp * vertex;\n"
595 " tex_c = tex_coord;\n" 595 " tex_c = tex_coord;\n"
596 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 596 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
597 " tex_s[1] = vec2( sample.x, -sample.y);\n" 597 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
598 " tex_s[2] = vec2( sample.x, sample.y);\n" 598 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
599 " tex_s[3] = vec2(-sample.x, sample.y);\n" 599 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
600 " div_s = vec4(4, 4, 4, 4);\n" 600 " div_s = vec4(4, 4, 4, 4);\n"
601 "}\n"; 601 "}\n";
602Evas_GL_Program_Source shader_img_22_bgra_nomul_vert_src = 602Evas_GL_Program_Source shader_img_22_bgra_nomul_vert_src =
@@ -613,7 +613,7 @@ static const char const img_22_bgra_vert_glsl[] =
613 "attribute vec4 vertex;\n" 613 "attribute vec4 vertex;\n"
614 "attribute vec4 color;\n" 614 "attribute vec4 color;\n"
615 "attribute vec2 tex_coord;\n" 615 "attribute vec2 tex_coord;\n"
616 "uniform vec2 sample;\n" 616 "attribute vec2 tex_sample;\n"
617 "uniform mat4 mvp;\n" 617 "uniform mat4 mvp;\n"
618 "varying vec4 col;\n" 618 "varying vec4 col;\n"
619 "varying vec2 tex_c;\n" 619 "varying vec2 tex_c;\n"
@@ -624,10 +624,10 @@ static const char const img_22_bgra_vert_glsl[] =
624 " gl_Position = mvp * vertex;\n" 624 " gl_Position = mvp * vertex;\n"
625 " col = color;\n" 625 " col = color;\n"
626 " tex_c = tex_coord;\n" 626 " tex_c = tex_coord;\n"
627 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 627 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
628 " tex_s[1] = vec2( sample.x, -sample.y);\n" 628 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
629 " tex_s[2] = vec2( sample.x, sample.y);\n" 629 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
630 " tex_s[3] = vec2(-sample.x, sample.y);\n" 630 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
631 " div_s = vec4(4, 4, 4, 4);\n" 631 " div_s = vec4(4, 4, 4, 4);\n"
632 "}\n"; 632 "}\n";
633Evas_GL_Program_Source shader_img_22_bgra_vert_src = 633Evas_GL_Program_Source shader_img_22_bgra_vert_src =
@@ -698,7 +698,7 @@ static const char const img_22_nomul_vert_glsl[] =
698 "#endif\n" 698 "#endif\n"
699 "attribute vec4 vertex;\n" 699 "attribute vec4 vertex;\n"
700 "attribute vec2 tex_coord;\n" 700 "attribute vec2 tex_coord;\n"
701 "uniform vec2 sample;\n" 701 "attribute vec2 tex_sample;\n"
702 "uniform mat4 mvp;\n" 702 "uniform mat4 mvp;\n"
703 "varying vec2 tex_c;\n" 703 "varying vec2 tex_c;\n"
704 "varying vec2 tex_s[4];\n" 704 "varying vec2 tex_s[4];\n"
@@ -707,10 +707,10 @@ static const char const img_22_nomul_vert_glsl[] =
707 "{\n" 707 "{\n"
708 " gl_Position = mvp * vertex;\n" 708 " gl_Position = mvp * vertex;\n"
709 " tex_c = tex_coord;\n" 709 " tex_c = tex_coord;\n"
710 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 710 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
711 " tex_s[1] = vec2( sample.x, -sample.y);\n" 711 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
712 " tex_s[2] = vec2( sample.x, sample.y);\n" 712 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
713 " tex_s[3] = vec2(-sample.x, sample.y);\n" 713 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
714 " div_s = vec4(4, 4, 4, 4);\n" 714 " div_s = vec4(4, 4, 4, 4);\n"
715 "}\n"; 715 "}\n";
716Evas_GL_Program_Source shader_img_22_nomul_vert_src = 716Evas_GL_Program_Source shader_img_22_nomul_vert_src =
@@ -727,7 +727,7 @@ static const char const img_22_vert_glsl[] =
727 "attribute vec4 vertex;\n" 727 "attribute vec4 vertex;\n"
728 "attribute vec4 color;\n" 728 "attribute vec4 color;\n"
729 "attribute vec2 tex_coord;\n" 729 "attribute vec2 tex_coord;\n"
730 "uniform vec2 sample;\n" 730 "attribute vec2 tex_sample;\n"
731 "uniform mat4 mvp;\n" 731 "uniform mat4 mvp;\n"
732 "varying vec4 col;\n" 732 "varying vec4 col;\n"
733 "varying vec2 tex_c;\n" 733 "varying vec2 tex_c;\n"
@@ -738,10 +738,10 @@ static const char const img_22_vert_glsl[] =
738 " gl_Position = mvp * vertex;\n" 738 " gl_Position = mvp * vertex;\n"
739 " col = color;\n" 739 " col = color;\n"
740 " tex_c = tex_coord;\n" 740 " tex_c = tex_coord;\n"
741 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 741 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
742 " tex_s[1] = vec2( sample.x, -sample.y);\n" 742 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
743 " tex_s[2] = vec2( sample.x, sample.y);\n" 743 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
744 " tex_s[3] = vec2(-sample.x, sample.y);\n" 744 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
745 " div_s = vec4(4, 4, 4, 4);\n" 745 " div_s = vec4(4, 4, 4, 4);\n"
746 "}\n"; 746 "}\n";
747Evas_GL_Program_Source shader_img_22_vert_src = 747Evas_GL_Program_Source shader_img_22_vert_src =
@@ -1210,7 +1210,7 @@ static const char const tex_12_vert_glsl[] =
1210 "attribute vec4 vertex;\n" 1210 "attribute vec4 vertex;\n"
1211 "attribute vec4 color;\n" 1211 "attribute vec4 color;\n"
1212 "attribute vec2 tex_coord;\n" 1212 "attribute vec2 tex_coord;\n"
1213 "uniform vec2 sample;\n" 1213 "attribute vec2 tex_sample;\n"
1214 "uniform mat4 mvp;\n" 1214 "uniform mat4 mvp;\n"
1215 "varying vec4 col;\n" 1215 "varying vec4 col;\n"
1216 "varying vec2 tex_c;\n" 1216 "varying vec2 tex_c;\n"
@@ -1221,8 +1221,8 @@ static const char const tex_12_vert_glsl[] =
1221 " gl_Position = mvp * vertex;\n" 1221 " gl_Position = mvp * vertex;\n"
1222 " col = color;\n" 1222 " col = color;\n"
1223 " tex_c = tex_coord;\n" 1223 " tex_c = tex_coord;\n"
1224 " tex_s[0] = vec2(0, -sample.y);\n" 1224 " tex_s[0] = vec2(0, -tex_sample.y);\n"
1225 " tex_s[1] = vec2(0, sample.y);\n" 1225 " tex_s[1] = vec2(0, tex_sample.y);\n"
1226 " div_s = vec4(2, 2, 2, 2);\n" 1226 " div_s = vec4(2, 2, 2, 2);\n"
1227 "}\n"; 1227 "}\n";
1228Evas_GL_Program_Source shader_tex_12_vert_src = 1228Evas_GL_Program_Source shader_tex_12_vert_src =
@@ -1263,7 +1263,7 @@ static const char const tex_12_nomul_vert_glsl[] =
1263 "#endif\n" 1263 "#endif\n"
1264 "attribute vec4 vertex;\n" 1264 "attribute vec4 vertex;\n"
1265 "attribute vec2 tex_coord;\n" 1265 "attribute vec2 tex_coord;\n"
1266 "uniform vec2 sample;\n" 1266 "attribute vec2 tex_sample;\n"
1267 "uniform mat4 mvp;\n" 1267 "uniform mat4 mvp;\n"
1268 "varying vec2 tex_c;\n" 1268 "varying vec2 tex_c;\n"
1269 "varying vec2 tex_s[2];\n" 1269 "varying vec2 tex_s[2];\n"
@@ -1272,8 +1272,8 @@ static const char const tex_12_nomul_vert_glsl[] =
1272 "{\n" 1272 "{\n"
1273 " gl_Position = mvp * vertex;\n" 1273 " gl_Position = mvp * vertex;\n"
1274 " tex_c = tex_coord;\n" 1274 " tex_c = tex_coord;\n"
1275 " tex_s[0] = vec2(0, -sample.y);\n" 1275 " tex_s[0] = vec2(0, -tex_sample.y);\n"
1276 " tex_s[1] = vec2(0, sample.y);\n" 1276 " tex_s[1] = vec2(0, tex_sample.y);\n"
1277 " div_s = vec4(2, 2, 2, 2);\n" 1277 " div_s = vec4(2, 2, 2, 2);\n"
1278 "}\n"; 1278 "}\n";
1279Evas_GL_Program_Source shader_tex_12_nomul_vert_src = 1279Evas_GL_Program_Source shader_tex_12_nomul_vert_src =
@@ -1316,7 +1316,7 @@ static const char const tex_21_vert_glsl[] =
1316 "attribute vec4 vertex;\n" 1316 "attribute vec4 vertex;\n"
1317 "attribute vec4 color;\n" 1317 "attribute vec4 color;\n"
1318 "attribute vec2 tex_coord;\n" 1318 "attribute vec2 tex_coord;\n"
1319 "uniform vec2 sample;\n" 1319 "attribute vec2 tex_sample;\n"
1320 "uniform mat4 mvp;\n" 1320 "uniform mat4 mvp;\n"
1321 "varying vec4 col;\n" 1321 "varying vec4 col;\n"
1322 "varying vec2 tex_c;\n" 1322 "varying vec2 tex_c;\n"
@@ -1327,8 +1327,8 @@ static const char const tex_21_vert_glsl[] =
1327 " gl_Position = mvp * vertex;\n" 1327 " gl_Position = mvp * vertex;\n"
1328 " col = color;\n" 1328 " col = color;\n"
1329 " tex_c = tex_coord;\n" 1329 " tex_c = tex_coord;\n"
1330 " tex_s[0] = vec2(-sample.x, 0);\n" 1330 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
1331 " tex_s[1] = vec2( sample.x, 0);\n" 1331 " tex_s[1] = vec2( tex_sample.x, 0);\n"
1332 " div_s = vec4(2, 2, 2, 2);\n" 1332 " div_s = vec4(2, 2, 2, 2);\n"
1333 "}\n"; 1333 "}\n";
1334Evas_GL_Program_Source shader_tex_21_vert_src = 1334Evas_GL_Program_Source shader_tex_21_vert_src =
@@ -1369,7 +1369,7 @@ static const char const tex_21_nomul_vert_glsl[] =
1369 "#endif\n" 1369 "#endif\n"
1370 "attribute vec4 vertex;\n" 1370 "attribute vec4 vertex;\n"
1371 "attribute vec2 tex_coord;\n" 1371 "attribute vec2 tex_coord;\n"
1372 "uniform vec2 sample;\n" 1372 "attribute vec2 tex_sample;\n"
1373 "uniform mat4 mvp;\n" 1373 "uniform mat4 mvp;\n"
1374 "varying vec2 tex_c;\n" 1374 "varying vec2 tex_c;\n"
1375 "varying vec2 tex_s[2];\n" 1375 "varying vec2 tex_s[2];\n"
@@ -1378,8 +1378,8 @@ static const char const tex_21_nomul_vert_glsl[] =
1378 "{\n" 1378 "{\n"
1379 " gl_Position = mvp * vertex;\n" 1379 " gl_Position = mvp * vertex;\n"
1380 " tex_c = tex_coord;\n" 1380 " tex_c = tex_coord;\n"
1381 " tex_s[0] = vec2(-sample.x, 0);\n" 1381 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
1382 " tex_s[1] = vec2( sample.x, 0);\n" 1382 " tex_s[1] = vec2( tex_sample.x, 0);\n"
1383 " div_s = vec4(2, 2, 2, 2);\n" 1383 " div_s = vec4(2, 2, 2, 2);\n"
1384 "}\n"; 1384 "}\n";
1385Evas_GL_Program_Source shader_tex_21_nomul_vert_src = 1385Evas_GL_Program_Source shader_tex_21_nomul_vert_src =
@@ -1424,7 +1424,7 @@ static const char const tex_22_vert_glsl[] =
1424 "attribute vec4 vertex;\n" 1424 "attribute vec4 vertex;\n"
1425 "attribute vec4 color;\n" 1425 "attribute vec4 color;\n"
1426 "attribute vec2 tex_coord;\n" 1426 "attribute vec2 tex_coord;\n"
1427 "uniform vec2 sample;\n" 1427 "attribute vec2 tex_sample;\n"
1428 "uniform mat4 mvp;\n" 1428 "uniform mat4 mvp;\n"
1429 "varying vec4 col;\n" 1429 "varying vec4 col;\n"
1430 "varying vec2 tex_c;\n" 1430 "varying vec2 tex_c;\n"
@@ -1435,10 +1435,10 @@ static const char const tex_22_vert_glsl[] =
1435 " gl_Position = mvp * vertex;\n" 1435 " gl_Position = mvp * vertex;\n"
1436 " col = color;\n" 1436 " col = color;\n"
1437 " tex_c = tex_coord;\n" 1437 " tex_c = tex_coord;\n"
1438 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 1438 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
1439 " tex_s[1] = vec2( sample.x, -sample.y);\n" 1439 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
1440 " tex_s[2] = vec2( sample.x, sample.y);\n" 1440 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
1441 " tex_s[3] = vec2(-sample.x, sample.y);\n" 1441 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
1442 " div_s = vec4(4, 4, 4, 4);\n" 1442 " div_s = vec4(4, 4, 4, 4);\n"
1443 "}\n"; 1443 "}\n";
1444Evas_GL_Program_Source shader_tex_22_vert_src = 1444Evas_GL_Program_Source shader_tex_22_vert_src =
@@ -1481,7 +1481,7 @@ static const char const tex_22_nomul_vert_glsl[] =
1481 "#endif\n" 1481 "#endif\n"
1482 "attribute vec4 vertex;\n" 1482 "attribute vec4 vertex;\n"
1483 "attribute vec2 tex_coord;\n" 1483 "attribute vec2 tex_coord;\n"
1484 "uniform vec2 sample;\n" 1484 "attribute vec2 tex_sample;\n"
1485 "uniform mat4 mvp;\n" 1485 "uniform mat4 mvp;\n"
1486 "varying vec2 tex_c;\n" 1486 "varying vec2 tex_c;\n"
1487 "varying vec2 tex_s[4];\n" 1487 "varying vec2 tex_s[4];\n"
@@ -1490,10 +1490,10 @@ static const char const tex_22_nomul_vert_glsl[] =
1490 "{\n" 1490 "{\n"
1491 " gl_Position = mvp * vertex;\n" 1491 " gl_Position = mvp * vertex;\n"
1492 " tex_c = tex_coord;\n" 1492 " tex_c = tex_coord;\n"
1493 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 1493 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
1494 " tex_s[1] = vec2( sample.x, -sample.y);\n" 1494 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
1495 " tex_s[2] = vec2( sample.x, sample.y);\n" 1495 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
1496 " tex_s[3] = vec2(-sample.x, sample.y);\n" 1496 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
1497 " div_s = vec4(4, 4, 4, 4);\n" 1497 " div_s = vec4(4, 4, 4, 4);\n"
1498 "}\n"; 1498 "}\n";
1499Evas_GL_Program_Source shader_tex_22_nomul_vert_src = 1499Evas_GL_Program_Source shader_tex_22_nomul_vert_src =
@@ -1671,7 +1671,7 @@ static const char const tex_22_afill_vert_glsl[] =
1671 "attribute vec4 vertex;\n" 1671 "attribute vec4 vertex;\n"
1672 "attribute vec4 color;\n" 1672 "attribute vec4 color;\n"
1673 "attribute vec2 tex_coord;\n" 1673 "attribute vec2 tex_coord;\n"
1674 "uniform vec2 sample;\n" 1674 "attribute vec2 tex_sample;\n"
1675 "uniform mat4 mvp;\n" 1675 "uniform mat4 mvp;\n"
1676 "varying vec4 col;\n" 1676 "varying vec4 col;\n"
1677 "varying vec2 tex_c;\n" 1677 "varying vec2 tex_c;\n"
@@ -1682,10 +1682,10 @@ static const char const tex_22_afill_vert_glsl[] =
1682 " gl_Position = mvp * vertex;\n" 1682 " gl_Position = mvp * vertex;\n"
1683 " col = color;\n" 1683 " col = color;\n"
1684 " tex_c = tex_coord;\n" 1684 " tex_c = tex_coord;\n"
1685 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 1685 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
1686 " tex_s[1] = vec2( sample.x, -sample.y);\n" 1686 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
1687 " tex_s[2] = vec2( sample.x, sample.y);\n" 1687 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
1688 " tex_s[3] = vec2(-sample.x, sample.y);\n" 1688 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
1689 " div_s = vec4(4, 4, 4, 4);\n" 1689 " div_s = vec4(4, 4, 4, 4);\n"
1690 "}\n"; 1690 "}\n";
1691Evas_GL_Program_Source shader_tex_22_afill_vert_src = 1691Evas_GL_Program_Source shader_tex_22_afill_vert_src =
@@ -1729,7 +1729,7 @@ static const char const tex_21_afill_vert_glsl[] =
1729 "attribute vec4 vertex;\n" 1729 "attribute vec4 vertex;\n"
1730 "attribute vec4 color;\n" 1730 "attribute vec4 color;\n"
1731 "attribute vec2 tex_coord;\n" 1731 "attribute vec2 tex_coord;\n"
1732 "uniform vec2 sample;\n" 1732 "attribute vec2 tex_sample;\n"
1733 "uniform mat4 mvp;\n" 1733 "uniform mat4 mvp;\n"
1734 "varying vec4 col;\n" 1734 "varying vec4 col;\n"
1735 "varying vec2 tex_c;\n" 1735 "varying vec2 tex_c;\n"
@@ -1740,8 +1740,8 @@ static const char const tex_21_afill_vert_glsl[] =
1740 " gl_Position = mvp * vertex;\n" 1740 " gl_Position = mvp * vertex;\n"
1741 " col = color;\n" 1741 " col = color;\n"
1742 " tex_c = tex_coord;\n" 1742 " tex_c = tex_coord;\n"
1743 " tex_s[0] = vec2(-sample.x, 0);\n" 1743 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
1744 " tex_s[1] = vec2( sample.x, 0);\n" 1744 " tex_s[1] = vec2( tex_sample.x, 0);\n"
1745 " div_s = vec4(2, 2, 2, 2);\n" 1745 " div_s = vec4(2, 2, 2, 2);\n"
1746 "}\n"; 1746 "}\n";
1747Evas_GL_Program_Source shader_tex_21_afill_vert_src = 1747Evas_GL_Program_Source shader_tex_21_afill_vert_src =
@@ -1785,7 +1785,7 @@ static const char const tex_12_afill_vert_glsl[] =
1785 "attribute vec4 vertex;\n" 1785 "attribute vec4 vertex;\n"
1786 "attribute vec4 color;\n" 1786 "attribute vec4 color;\n"
1787 "attribute vec2 tex_coord;\n" 1787 "attribute vec2 tex_coord;\n"
1788 "uniform vec2 sample;\n" 1788 "attribute vec2 tex_sample;\n"
1789 "uniform mat4 mvp;\n" 1789 "uniform mat4 mvp;\n"
1790 "varying vec4 col;\n" 1790 "varying vec4 col;\n"
1791 "varying vec2 tex_c;\n" 1791 "varying vec2 tex_c;\n"
@@ -1796,8 +1796,8 @@ static const char const tex_12_afill_vert_glsl[] =
1796 " gl_Position = mvp * vertex;\n" 1796 " gl_Position = mvp * vertex;\n"
1797 " col = color;\n" 1797 " col = color;\n"
1798 " tex_c = tex_coord;\n" 1798 " tex_c = tex_coord;\n"
1799 " tex_s[0] = vec2(0, -sample.y);\n" 1799 " tex_s[0] = vec2(0, -tex_sample.y);\n"
1800 " tex_s[1] = vec2(0, sample.y);\n" 1800 " tex_s[1] = vec2(0, tex_sample.y);\n"
1801 " div_s = vec4(2, 2, 2, 2);\n" 1801 " div_s = vec4(2, 2, 2, 2);\n"
1802 "}\n"; 1802 "}\n";
1803Evas_GL_Program_Source shader_tex_12_afill_vert_src = 1803Evas_GL_Program_Source shader_tex_12_afill_vert_src =
@@ -1841,7 +1841,7 @@ static const char const tex_22_nomul_afill_vert_glsl[] =
1841 "#endif\n" 1841 "#endif\n"
1842 "attribute vec4 vertex;\n" 1842 "attribute vec4 vertex;\n"
1843 "attribute vec2 tex_coord;\n" 1843 "attribute vec2 tex_coord;\n"
1844 "uniform vec2 sample;\n" 1844 "attribute vec2 tex_sample;\n"
1845 "uniform mat4 mvp;\n" 1845 "uniform mat4 mvp;\n"
1846 "varying vec2 tex_c;\n" 1846 "varying vec2 tex_c;\n"
1847 "varying vec2 tex_s[4];\n" 1847 "varying vec2 tex_s[4];\n"
@@ -1850,10 +1850,10 @@ static const char const tex_22_nomul_afill_vert_glsl[] =
1850 "{\n" 1850 "{\n"
1851 " gl_Position = mvp * vertex;\n" 1851 " gl_Position = mvp * vertex;\n"
1852 " tex_c = tex_coord;\n" 1852 " tex_c = tex_coord;\n"
1853 " tex_s[0] = vec2(-sample.x, -sample.y);\n" 1853 " tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);\n"
1854 " tex_s[1] = vec2( sample.x, -sample.y);\n" 1854 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n"
1855 " tex_s[2] = vec2( sample.x, sample.y);\n" 1855 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n"
1856 " tex_s[3] = vec2(-sample.x, sample.y);\n" 1856 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n"
1857 " div_s = vec4(4, 4, 4, 4);\n" 1857 " div_s = vec4(4, 4, 4, 4);\n"
1858 "}\n"; 1858 "}\n";
1859Evas_GL_Program_Source shader_tex_22_nomul_afill_vert_src = 1859Evas_GL_Program_Source shader_tex_22_nomul_afill_vert_src =
@@ -1895,7 +1895,7 @@ static const char const tex_21_nomul_afill_vert_glsl[] =
1895 "#endif\n" 1895 "#endif\n"
1896 "attribute vec4 vertex;\n" 1896 "attribute vec4 vertex;\n"
1897 "attribute vec2 tex_coord;\n" 1897 "attribute vec2 tex_coord;\n"
1898 "uniform vec2 sample;\n" 1898 "attribute vec2 tex_sample;\n"
1899 "uniform mat4 mvp;\n" 1899 "uniform mat4 mvp;\n"
1900 "varying vec2 tex_c;\n" 1900 "varying vec2 tex_c;\n"
1901 "varying vec2 tex_s[2];\n" 1901 "varying vec2 tex_s[2];\n"
@@ -1904,8 +1904,8 @@ static const char const tex_21_nomul_afill_vert_glsl[] =
1904 "{\n" 1904 "{\n"
1905 " gl_Position = mvp * vertex;\n" 1905 " gl_Position = mvp * vertex;\n"
1906 " tex_c = tex_coord;\n" 1906 " tex_c = tex_coord;\n"
1907 " tex_s[0] = vec2(-sample.x, 0);\n" 1907 " tex_s[0] = vec2(-tex_sample.x, 0);\n"
1908 " tex_s[1] = vec2( sample.x, 0);\n" 1908 " tex_s[1] = vec2( tex_sample.x, 0);\n"
1909 " div_s = vec4(2, 2, 2, 2);\n" 1909 " div_s = vec4(2, 2, 2, 2);\n"
1910 "}\n"; 1910 "}\n";
1911Evas_GL_Program_Source shader_tex_21_nomul_afill_vert_src = 1911Evas_GL_Program_Source shader_tex_21_nomul_afill_vert_src =
@@ -1947,7 +1947,7 @@ static const char const tex_12_nomul_afill_vert_glsl[] =
1947 "#endif\n" 1947 "#endif\n"
1948 "attribute vec4 vertex;\n" 1948 "attribute vec4 vertex;\n"
1949 "attribute vec2 tex_coord;\n" 1949 "attribute vec2 tex_coord;\n"
1950 "uniform vec2 sample;\n" 1950 "attribute vec2 tex_sample;\n"
1951 "uniform mat4 mvp;\n" 1951 "uniform mat4 mvp;\n"
1952 "varying vec2 tex_c;\n" 1952 "varying vec2 tex_c;\n"
1953 "varying vec2 tex_s[2];\n" 1953 "varying vec2 tex_s[2];\n"
@@ -1956,8 +1956,8 @@ static const char const tex_12_nomul_afill_vert_glsl[] =
1956 "{\n" 1956 "{\n"
1957 " gl_Position = mvp * vertex;\n" 1957 " gl_Position = mvp * vertex;\n"
1958 " tex_c = tex_coord;\n" 1958 " tex_c = tex_coord;\n"
1959 " tex_s[0] = vec2(0, -sample.y);\n" 1959 " tex_s[0] = vec2(0, -tex_sample.y);\n"
1960 " tex_s[1] = vec2(0, sample.y);\n" 1960 " tex_s[1] = vec2(0, tex_sample.y);\n"
1961 " div_s = vec4(2, 2, 2, 2);\n" 1961 " div_s = vec4(2, 2, 2, 2);\n"
1962 "}\n"; 1962 "}\n";
1963Evas_GL_Program_Source shader_tex_12_nomul_afill_vert_src = 1963Evas_GL_Program_Source shader_tex_12_nomul_afill_vert_src =
diff --git a/src/modules/evas/engines/gl_common/shader/img_12_bgra_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_12_bgra_nomul_vert.shd
index 0d45f9890b..40144aae07 100644
--- a/src/modules/evas/engines/gl_common/shader/img_12_bgra_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_12_bgra_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(0, -sample.y); 15 tex_s[0] = vec2(0, -tex_sample.y);
16 tex_s[1] = vec2(0, sample.y); 16 tex_s[1] = vec2(0, tex_sample.y);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/img_12_bgra_vert.shd b/src/modules/evas/engines/gl_common/shader/img_12_bgra_vert.shd
index df2b9f091f..810d73aaaa 100644
--- a/src/modules/evas/engines/gl_common/shader/img_12_bgra_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_12_bgra_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(0, -sample.y); 18 tex_s[0] = vec2(0, -tex_sample.y);
19 tex_s[1] = vec2(0, sample.y); 19 tex_s[1] = vec2(0, tex_sample.y);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/img_12_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_12_nomul_vert.shd
index 0d45f9890b..40144aae07 100644
--- a/src/modules/evas/engines/gl_common/shader/img_12_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_12_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(0, -sample.y); 15 tex_s[0] = vec2(0, -tex_sample.y);
16 tex_s[1] = vec2(0, sample.y); 16 tex_s[1] = vec2(0, tex_sample.y);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/img_12_vert.shd b/src/modules/evas/engines/gl_common/shader/img_12_vert.shd
index df2b9f091f..810d73aaaa 100644
--- a/src/modules/evas/engines/gl_common/shader/img_12_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_12_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(0, -sample.y); 18 tex_s[0] = vec2(0, -tex_sample.y);
19 tex_s[1] = vec2(0, sample.y); 19 tex_s[1] = vec2(0, tex_sample.y);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/img_21_bgra_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_21_bgra_nomul_vert.shd
index ea6d9e07eb..a6b149f5c5 100644
--- a/src/modules/evas/engines/gl_common/shader/img_21_bgra_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_21_bgra_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, 0); 15 tex_s[0] = vec2(-tex_sample.x, 0);
16 tex_s[1] = vec2( sample.x, 0); 16 tex_s[1] = vec2( tex_sample.x, 0);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/img_21_bgra_vert.shd b/src/modules/evas/engines/gl_common/shader/img_21_bgra_vert.shd
index 915eb36629..98d9154a73 100644
--- a/src/modules/evas/engines/gl_common/shader/img_21_bgra_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_21_bgra_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, 0); 18 tex_s[0] = vec2(-tex_sample.x, 0);
19 tex_s[1] = vec2( sample.x, 0); 19 tex_s[1] = vec2( tex_sample.x, 0);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/img_21_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_21_nomul_vert.shd
index ea6d9e07eb..a6b149f5c5 100644
--- a/src/modules/evas/engines/gl_common/shader/img_21_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_21_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, 0); 15 tex_s[0] = vec2(-tex_sample.x, 0);
16 tex_s[1] = vec2( sample.x, 0); 16 tex_s[1] = vec2( tex_sample.x, 0);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/img_21_vert.shd b/src/modules/evas/engines/gl_common/shader/img_21_vert.shd
index 915eb36629..98d9154a73 100644
--- a/src/modules/evas/engines/gl_common/shader/img_21_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_21_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, 0); 18 tex_s[0] = vec2(-tex_sample.x, 0);
19 tex_s[1] = vec2( sample.x, 0); 19 tex_s[1] = vec2( tex_sample.x, 0);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/img_22_bgra_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_22_bgra_nomul_vert.shd
index b8c6dbfd83..e6303d782d 100644
--- a/src/modules/evas/engines/gl_common/shader/img_22_bgra_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_22_bgra_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[4]; 9varying vec2 tex_s[4];
@@ -12,9 +12,9 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, -sample.y); 15 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
16 tex_s[1] = vec2( sample.x, -sample.y); 16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
17 tex_s[2] = vec2( sample.x, sample.y); 17 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
18 tex_s[3] = vec2(-sample.x, sample.y); 18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
19 div_s = vec4(4, 4, 4, 4); 19 div_s = vec4(4, 4, 4, 4);
20} 20}
diff --git a/src/modules/evas/engines/gl_common/shader/img_22_bgra_vert.shd b/src/modules/evas/engines/gl_common/shader/img_22_bgra_vert.shd
index 5816b96bb5..e964ea1e81 100644
--- a/src/modules/evas/engines/gl_common/shader/img_22_bgra_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_22_bgra_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,9 +15,9 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, -sample.y); 18 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
19 tex_s[1] = vec2( sample.x, -sample.y); 19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
20 tex_s[2] = vec2( sample.x, sample.y); 20 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
21 tex_s[3] = vec2(-sample.x, sample.y); 21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
22 div_s = vec4(4, 4, 4, 4); 22 div_s = vec4(4, 4, 4, 4);
23} 23}
diff --git a/src/modules/evas/engines/gl_common/shader/img_22_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_22_nomul_vert.shd
index b8c6dbfd83..e6303d782d 100644
--- a/src/modules/evas/engines/gl_common/shader/img_22_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_22_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[4]; 9varying vec2 tex_s[4];
@@ -12,9 +12,9 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, -sample.y); 15 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
16 tex_s[1] = vec2( sample.x, -sample.y); 16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
17 tex_s[2] = vec2( sample.x, sample.y); 17 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
18 tex_s[3] = vec2(-sample.x, sample.y); 18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
19 div_s = vec4(4, 4, 4, 4); 19 div_s = vec4(4, 4, 4, 4);
20} 20}
diff --git a/src/modules/evas/engines/gl_common/shader/img_22_vert.shd b/src/modules/evas/engines/gl_common/shader/img_22_vert.shd
index 5816b96bb5..e964ea1e81 100644
--- a/src/modules/evas/engines/gl_common/shader/img_22_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_22_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,9 +15,9 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, -sample.y); 18 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
19 tex_s[1] = vec2( sample.x, -sample.y); 19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
20 tex_s[2] = vec2( sample.x, sample.y); 20 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
21 tex_s[3] = vec2(-sample.x, sample.y); 21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
22 div_s = vec4(4, 4, 4, 4); 22 div_s = vec4(4, 4, 4, 4);
23} 23}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_12_afill_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_12_afill_vert.shd
index df2b9f091f..810d73aaaa 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_12_afill_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_12_afill_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(0, -sample.y); 18 tex_s[0] = vec2(0, -tex_sample.y);
19 tex_s[1] = vec2(0, sample.y); 19 tex_s[1] = vec2(0, tex_sample.y);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_12_nomul_afill_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_12_nomul_afill_vert.shd
index 0d45f9890b..40144aae07 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_12_nomul_afill_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_12_nomul_afill_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(0, -sample.y); 15 tex_s[0] = vec2(0, -tex_sample.y);
16 tex_s[1] = vec2(0, sample.y); 16 tex_s[1] = vec2(0, tex_sample.y);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_12_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_12_nomul_vert.shd
index 0d45f9890b..40144aae07 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_12_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_12_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(0, -sample.y); 15 tex_s[0] = vec2(0, -tex_sample.y);
16 tex_s[1] = vec2(0, sample.y); 16 tex_s[1] = vec2(0, tex_sample.y);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_12_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_12_vert.shd
index df2b9f091f..810d73aaaa 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_12_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_12_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(0, -sample.y); 18 tex_s[0] = vec2(0, -tex_sample.y);
19 tex_s[1] = vec2(0, sample.y); 19 tex_s[1] = vec2(0, tex_sample.y);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_21_afill_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_21_afill_vert.shd
index 915eb36629..98d9154a73 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_21_afill_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_21_afill_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, 0); 18 tex_s[0] = vec2(-tex_sample.x, 0);
19 tex_s[1] = vec2( sample.x, 0); 19 tex_s[1] = vec2( tex_sample.x, 0);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_21_nomul_afill_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_21_nomul_afill_vert.shd
index ea6d9e07eb..a6b149f5c5 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_21_nomul_afill_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_21_nomul_afill_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, 0); 15 tex_s[0] = vec2(-tex_sample.x, 0);
16 tex_s[1] = vec2( sample.x, 0); 16 tex_s[1] = vec2( tex_sample.x, 0);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_21_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_21_nomul_vert.shd
index ea6d9e07eb..a6b149f5c5 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_21_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_21_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[2]; 9varying vec2 tex_s[2];
@@ -12,7 +12,7 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, 0); 15 tex_s[0] = vec2(-tex_sample.x, 0);
16 tex_s[1] = vec2( sample.x, 0); 16 tex_s[1] = vec2( tex_sample.x, 0);
17 div_s = vec4(2, 2, 2, 2); 17 div_s = vec4(2, 2, 2, 2);
18} 18}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_21_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_21_vert.shd
index 915eb36629..98d9154a73 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_21_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_21_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,7 +15,7 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, 0); 18 tex_s[0] = vec2(-tex_sample.x, 0);
19 tex_s[1] = vec2( sample.x, 0); 19 tex_s[1] = vec2( tex_sample.x, 0);
20 div_s = vec4(2, 2, 2, 2); 20 div_s = vec4(2, 2, 2, 2);
21} 21}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_22_afill_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_22_afill_vert.shd
index 5816b96bb5..e964ea1e81 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_22_afill_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_22_afill_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,9 +15,9 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, -sample.y); 18 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
19 tex_s[1] = vec2( sample.x, -sample.y); 19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
20 tex_s[2] = vec2( sample.x, sample.y); 20 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
21 tex_s[3] = vec2(-sample.x, sample.y); 21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
22 div_s = vec4(4, 4, 4, 4); 22 div_s = vec4(4, 4, 4, 4);
23} 23}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_22_nomul_afill_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_22_nomul_afill_vert.shd
index b8c6dbfd83..e6303d782d 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_22_nomul_afill_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_22_nomul_afill_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[4]; 9varying vec2 tex_s[4];
@@ -12,9 +12,9 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, -sample.y); 15 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
16 tex_s[1] = vec2( sample.x, -sample.y); 16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
17 tex_s[2] = vec2( sample.x, sample.y); 17 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
18 tex_s[3] = vec2(-sample.x, sample.y); 18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
19 div_s = vec4(4, 4, 4, 4); 19 div_s = vec4(4, 4, 4, 4);
20} 20}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_22_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_22_nomul_vert.shd
index b8c6dbfd83..e6303d782d 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_22_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_22_nomul_vert.shd
@@ -3,7 +3,7 @@ precision highp float;
3#endif 3#endif
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec2 tex_coord; 5attribute vec2 tex_coord;
6uniform vec2 sample; 6attribute vec2 tex_sample;
7uniform mat4 mvp; 7uniform mat4 mvp;
8varying vec2 tex_c; 8varying vec2 tex_c;
9varying vec2 tex_s[4]; 9varying vec2 tex_s[4];
@@ -12,9 +12,9 @@ void main()
12{ 12{
13 gl_Position = mvp * vertex; 13 gl_Position = mvp * vertex;
14 tex_c = tex_coord; 14 tex_c = tex_coord;
15 tex_s[0] = vec2(-sample.x, -sample.y); 15 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
16 tex_s[1] = vec2( sample.x, -sample.y); 16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
17 tex_s[2] = vec2( sample.x, sample.y); 17 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
18 tex_s[3] = vec2(-sample.x, sample.y); 18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
19 div_s = vec4(4, 4, 4, 4); 19 div_s = vec4(4, 4, 4, 4);
20} 20}
diff --git a/src/modules/evas/engines/gl_common/shader/tex_22_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_22_vert.shd
index 5816b96bb5..e964ea1e81 100644
--- a/src/modules/evas/engines/gl_common/shader/tex_22_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_22_vert.shd
@@ -4,7 +4,7 @@ precision highp float;
4attribute vec4 vertex; 4attribute vec4 vertex;
5attribute vec4 color; 5attribute vec4 color;
6attribute vec2 tex_coord; 6attribute vec2 tex_coord;
7uniform vec2 sample; 7attribute vec2 tex_sample;
8uniform mat4 mvp; 8uniform mat4 mvp;
9varying vec4 col; 9varying vec4 col;
10varying vec2 tex_c; 10varying vec2 tex_c;
@@ -15,9 +15,9 @@ void main()
15 gl_Position = mvp * vertex; 15 gl_Position = mvp * vertex;
16 col = color; 16 col = color;
17 tex_c = tex_coord; 17 tex_c = tex_coord;
18 tex_s[0] = vec2(-sample.x, -sample.y); 18 tex_s[0] = vec2(-tex_sample.x, -tex_sample.y);
19 tex_s[1] = vec2( sample.x, -sample.y); 19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y);
20 tex_s[2] = vec2( sample.x, sample.y); 20 tex_s[2] = vec2( tex_sample.x, tex_sample.y);
21 tex_s[3] = vec2(-sample.x, sample.y); 21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y);
22 div_s = vec4(4, 4, 4, 4); 22 div_s = vec4(4, 4, 4, 4);
23} 23}