summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-02-11 20:39:05 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-02-12 11:23:03 +0900
commit986b60eaf0175b3592883c85cfb6f5f5a280f31d (patch)
tree7d7007b96cf16c17a4974758b2a79ad3c26cf8b6
parent7c5f92d702e2534b7b664d2b20d060dcac5fa6e6 (diff)
Evas GL common: Use uniform instead of attribute for sample
Image and texture programs "12", "21" and "22" used tex_sample as a texture attribute passed to the vertex shader. Instead of this seemingly hackish solution, use a vec2 uniform.
Diffstat
-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.c53
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_shader.c3
-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, 180 insertions, 233 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 481a55713c..f8effa3a64 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -276,8 +276,7 @@
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_TEXSAM 6 279#define SHAD_TEXM 6
280#define SHAD_TEXM 7
281 280
282typedef struct _Evas_GL_Program Evas_GL_Program; 281typedef struct _Evas_GL_Program Evas_GL_Program;
283typedef struct _Evas_GL_Program_Source Evas_GL_Program_Source; 282typedef struct _Evas_GL_Program_Source Evas_GL_Program_Source;
@@ -474,7 +473,6 @@ struct _Evas_Engine_GL_Context
474 GLfloat *texuv2; 473 GLfloat *texuv2;
475 GLfloat *texuv3; 474 GLfloat *texuv3;
476 GLfloat *texa; 475 GLfloat *texa;
477 GLfloat *texsam;
478 GLfloat *texm; 476 GLfloat *texm;
479 Eina_List *uniforms; /* Evas_GL_Uniform */ 477 Eina_List *uniforms; /* Evas_GL_Uniform */
480 Eina_Bool line: 1; 478 Eina_Bool line: 1;
@@ -484,7 +482,6 @@ struct _Evas_Engine_GL_Context
484 Eina_Bool use_texuv2 : 1; 482 Eina_Bool use_texuv2 : 1;
485 Eina_Bool use_texuv3 : 1; 483 Eina_Bool use_texuv3 : 1;
486 Eina_Bool use_texa : 1; 484 Eina_Bool use_texa : 1;
487 Eina_Bool use_texsam : 1;
488 Eina_Bool use_texm : 1; 485 Eina_Bool use_texm : 1;
489 Eina_Bool anti_alias : 1; 486 Eina_Bool anti_alias : 1;
490 Evas_GL_Image *im; 487 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 080ae2a4eb..1cdb240da5 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -949,7 +949,6 @@ evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
949 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa); 949 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa);
950 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2); 950 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
951 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3); 951 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
952 if (gc->pipe[i].array.texsam) free(gc->pipe[i].array.texsam);
953 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm); 952 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm);
954 } 953 }
955 } 954 }
@@ -1251,9 +1250,6 @@ evas_gl_common_context_target_surface_set(Evas_Engine_GL_Context *gc,
1251#define PUSH_TEXM(n, u, v) do { \ 1250#define PUSH_TEXM(n, u, v) do { \
1252 gc->pipe[n].array.texm[nm++] = u; \ 1251 gc->pipe[n].array.texm[nm++] = u; \
1253 gc->pipe[n].array.texm[nm++] = v; } while(0) 1252 gc->pipe[n].array.texm[nm++] = v; } while(0)
1254#define PUSH_TEXSAM(n, x, y) do { \
1255 gc->pipe[n].array.texsam[ns++] = x; \
1256 gc->pipe[n].array.texsam[ns++] = y; } while(0)
1257 1253
1258#define PUSH_6_COLORS(pn, r, g, b, a) \ 1254#define PUSH_6_COLORS(pn, r, g, b, a) \
1259 do { int i; for (i = 0; i < 6; i++) PUSH_COLOR(pn, r, g, b, a); } while(0) 1255 do { int i; for (i = 0; i < 6; i++) PUSH_COLOR(pn, r, g, b, a); } while(0)
@@ -1300,7 +1296,6 @@ array_alloc(Evas_Engine_GL_Context *gc, int n)
1300 ALOC(texa, GLfloat, 2); 1296 ALOC(texa, GLfloat, 2);
1301 ALOC(texuv2, GLfloat, 2); 1297 ALOC(texuv2, GLfloat, 2);
1302 ALOC(texuv3, GLfloat, 2); 1298 ALOC(texuv3, GLfloat, 2);
1303 ALOC(texsam, GLfloat, 2);
1304 ALOC(texm, GLfloat, 2); 1299 ALOC(texm, GLfloat, 2);
1305 return; 1300 return;
1306 } 1301 }
@@ -1316,7 +1311,6 @@ array_alloc(Evas_Engine_GL_Context *gc, int n)
1316 RALOC(texa, GLfloat, 2); 1311 RALOC(texa, GLfloat, 2);
1317 RALOC(texuv2, GLfloat, 2); 1312 RALOC(texuv2, GLfloat, 2);
1318 RALOC(texuv3, GLfloat, 2); 1313 RALOC(texuv3, GLfloat, 2);
1319 RALOC(texsam, GLfloat, 2);
1320 RALOC(texm, GLfloat, 2); 1314 RALOC(texm, GLfloat, 2);
1321} 1315}
1322 1316
@@ -1653,7 +1647,6 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
1653 gc->pipe[pn].array.use_texuv2 = 0; 1647 gc->pipe[pn].array.use_texuv2 = 0;
1654 gc->pipe[pn].array.use_texuv3 = 0; 1648 gc->pipe[pn].array.use_texuv3 = 0;
1655 gc->pipe[pn].array.use_texa = 0; 1649 gc->pipe[pn].array.use_texa = 0;
1656 gc->pipe[pn].array.use_texsam = 0;
1657 gc->pipe[pn].array.use_texm = 0; 1650 gc->pipe[pn].array.use_texm = 0;
1658 1651
1659 PIPE_GROW(gc, pn, 2); 1652 PIPE_GROW(gc, pn, 2);
@@ -1674,7 +1667,6 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
1674 gc->pipe[pn].array.use_texuv2 = 0; 1667 gc->pipe[pn].array.use_texuv2 = 0;
1675 gc->pipe[pn].array.use_texuv3 = 0; 1668 gc->pipe[pn].array.use_texuv3 = 0;
1676 gc->pipe[pn].array.use_texa = 0; 1669 gc->pipe[pn].array.use_texa = 0;
1677 gc->pipe[pn].array.use_texsam = 0;
1678 gc->pipe[pn].array.use_texm = 0; 1670 gc->pipe[pn].array.use_texm = 0;
1679} 1671}
1680 1672
@@ -1727,7 +1719,6 @@ again:
1727 gc->pipe[pn].array.use_texuv2 = 0; 1719 gc->pipe[pn].array.use_texuv2 = 0;
1728 gc->pipe[pn].array.use_texuv3 = 0; 1720 gc->pipe[pn].array.use_texuv3 = 0;
1729 gc->pipe[pn].array.use_texa = 0; 1721 gc->pipe[pn].array.use_texa = 0;
1730 gc->pipe[pn].array.use_texsam = 0;
1731 gc->pipe[pn].array.use_texm = !!mtex; 1722 gc->pipe[pn].array.use_texm = !!mtex;
1732 } 1723 }
1733 else 1724 else
@@ -1779,7 +1770,6 @@ again:
1779 gc->pipe[pn].array.use_texuv2 = 0; 1770 gc->pipe[pn].array.use_texuv2 = 0;
1780 gc->pipe[pn].array.use_texuv3 = 0; 1771 gc->pipe[pn].array.use_texuv3 = 0;
1781 gc->pipe[pn].array.use_texa = 0; 1772 gc->pipe[pn].array.use_texa = 0;
1782 gc->pipe[pn].array.use_texsam = 0;
1783 gc->pipe[pn].array.use_texm = !!mtex; 1773 gc->pipe[pn].array.use_texm = !!mtex;
1784 } 1774 }
1785 } 1775 }
@@ -1815,7 +1805,6 @@ again:
1815 gc->pipe[pn].array.use_texuv2 = 0; 1805 gc->pipe[pn].array.use_texuv2 = 0;
1816 gc->pipe[pn].array.use_texuv3 = 0; 1806 gc->pipe[pn].array.use_texuv3 = 0;
1817 gc->pipe[pn].array.use_texa = 0; 1807 gc->pipe[pn].array.use_texa = 0;
1818 gc->pipe[pn].array.use_texsam = 0;
1819 gc->pipe[pn].array.use_texm = !!mtex; 1808 gc->pipe[pn].array.use_texm = !!mtex;
1820#endif 1809#endif
1821 1810
@@ -2070,7 +2059,6 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2070 gc->pipe[pn].array.use_texuv2 = 0; 2059 gc->pipe[pn].array.use_texuv2 = 0;
2071 gc->pipe[pn].array.use_texuv3 = 0; 2060 gc->pipe[pn].array.use_texuv3 = 0;
2072 gc->pipe[pn].array.use_texm = !!mtex; 2061 gc->pipe[pn].array.use_texm = !!mtex;
2073 gc->pipe[pn].array.use_texsam = sam;
2074 2062
2075 pipe_region_expand(gc, pn, x, y, w, h); 2063 pipe_region_expand(gc, pn, x, y, w, h);
2076 PIPE_GROW(gc, pn, 6); 2064 PIPE_GROW(gc, pn, 6);
@@ -2110,14 +2098,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2110 { 2098 {
2111 double samx = (double)(sw) / (double)(tex->pt->w * w * 4); 2099 double samx = (double)(sw) / (double)(tex->pt->w * w * 4);
2112 double samy = (double)(sh) / (double)(tex->pt->h * h * 4); 2100 double samy = (double)(sh) / (double)(tex->pt->h * h * 4);
2113 2101 PUSH_UNIFORM(pn, EVAS_GL_UNIFORM_VEC2, "sample", samx, samy);
2114 PUSH_TEXSAM(pn, samx, samy);
2115 PUSH_TEXSAM(pn, samx, samy);
2116 PUSH_TEXSAM(pn, samx, samy);
2117
2118 PUSH_TEXSAM(pn, samx, samy);
2119 PUSH_TEXSAM(pn, samx, samy);
2120 PUSH_TEXSAM(pn, samx, samy);
2121 } 2102 }
2122 2103
2123 PUSH_MASK(pn, mtex, mx, my, mw, mh); 2104 PUSH_MASK(pn, mtex, mx, my, mw, mh);
@@ -2170,7 +2151,6 @@ evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
2170 gc->pipe[pn].array.use_texuv2 = 0; 2151 gc->pipe[pn].array.use_texuv2 = 0;
2171 gc->pipe[pn].array.use_texuv3 = 0; 2152 gc->pipe[pn].array.use_texuv3 = 0;
2172 gc->pipe[pn].array.use_texm = !!mtex; 2153 gc->pipe[pn].array.use_texm = !!mtex;
2173 gc->pipe[pn].array.use_texsam = 0;
2174 2154
2175 pipe_region_expand(gc, pn, x, y, w, h); 2155 pipe_region_expand(gc, pn, x, y, w, h);
2176 PIPE_GROW(gc, pn, 6); 2156 PIPE_GROW(gc, pn, 6);
@@ -2264,7 +2244,6 @@ evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
2264 gc->pipe[pn].array.use_texuv2 = 1; 2244 gc->pipe[pn].array.use_texuv2 = 1;
2265 gc->pipe[pn].array.use_texuv3 = 1; 2245 gc->pipe[pn].array.use_texuv3 = 1;
2266 gc->pipe[pn].array.use_texm = !!mtex; 2246 gc->pipe[pn].array.use_texm = !!mtex;
2267 gc->pipe[pn].array.use_texsam = 0;
2268 2247
2269 pipe_region_expand(gc, pn, x, y, w, h); 2248 pipe_region_expand(gc, pn, x, y, w, h);
2270 PIPE_GROW(gc, pn, 6); 2249 PIPE_GROW(gc, pn, 6);
@@ -2368,7 +2347,6 @@ evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
2368 gc->pipe[pn].array.use_texuv2 = 1; 2347 gc->pipe[pn].array.use_texuv2 = 1;
2369 gc->pipe[pn].array.use_texuv3 = 0; 2348 gc->pipe[pn].array.use_texuv3 = 0;
2370 gc->pipe[pn].array.use_texm = !!mtex; 2349 gc->pipe[pn].array.use_texm = !!mtex;
2371 gc->pipe[pn].array.use_texsam = 0;
2372 2350
2373 pipe_region_expand(gc, pn, x, y, w, h); 2351 pipe_region_expand(gc, pn, x, y, w, h);
2374 PIPE_GROW(gc, pn, 6); 2352 PIPE_GROW(gc, pn, 6);
@@ -2466,7 +2444,6 @@ evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
2466 gc->pipe[pn].array.use_texuv2 = 1; 2444 gc->pipe[pn].array.use_texuv2 = 1;
2467 gc->pipe[pn].array.use_texuv3 = 0; 2445 gc->pipe[pn].array.use_texuv3 = 0;
2468 gc->pipe[pn].array.use_texm = !!mtex; 2446 gc->pipe[pn].array.use_texm = !!mtex;
2469 gc->pipe[pn].array.use_texsam = 0;
2470 2447
2471 pipe_region_expand(gc, pn, x, y, w, h); 2448 pipe_region_expand(gc, pn, x, y, w, h);
2472 PIPE_GROW(gc, pn, 6); 2449 PIPE_GROW(gc, pn, 6);
@@ -2569,7 +2546,6 @@ evas_gl_common_context_rgb_a_pair_push(Evas_Engine_GL_Context *gc,
2569 gc->pipe[pn].array.use_texuv2 = 0; 2546 gc->pipe[pn].array.use_texuv2 = 0;
2570 gc->pipe[pn].array.use_texuv3 = 0; 2547 gc->pipe[pn].array.use_texuv3 = 0;
2571 gc->pipe[pn].array.use_texa = EINA_TRUE; 2548 gc->pipe[pn].array.use_texa = EINA_TRUE;
2572 gc->pipe[pn].array.use_texsam = 0;
2573 gc->pipe[pn].array.use_texm = !!mtex; 2549 gc->pipe[pn].array.use_texm = !!mtex;
2574 2550
2575 pipe_region_expand(gc, pn, x, y, w, h); 2551 pipe_region_expand(gc, pn, x, y, w, h);
@@ -2822,7 +2798,6 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
2822 gc->pipe[pn].array.use_texuv3 = (utexture) ? 1 : 0; 2798 gc->pipe[pn].array.use_texuv3 = (utexture) ? 1 : 0;
2823 gc->pipe[pn].array.use_texm = !!mtex; 2799 gc->pipe[pn].array.use_texm = !!mtex;
2824 gc->pipe[pn].array.use_texa = 0; 2800 gc->pipe[pn].array.use_texa = 0;
2825 gc->pipe[pn].array.use_texsam = 0;
2826 2801
2827 pipe_region_expand(gc, pn, x, y, w, h); 2802 pipe_region_expand(gc, pn, x, y, w, h);
2828 PIPE_GROW(gc, pn, 6); 2803 PIPE_GROW(gc, pn, 6);
@@ -3266,7 +3241,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3266 unsigned char *texuv2_ptr = NULL; 3241 unsigned char *texuv2_ptr = NULL;
3267 unsigned char *texuv3_ptr = NULL; 3242 unsigned char *texuv3_ptr = NULL;
3268 unsigned char *texa_ptr = NULL; 3243 unsigned char *texa_ptr = NULL;
3269 unsigned char *texsam_ptr = NULL;
3270 unsigned char *texm_ptr = NULL; 3244 unsigned char *texm_ptr = NULL;
3271 3245
3272 if (glsym_glMapBuffer && glsym_glUnmapBuffer) 3246 if (glsym_glMapBuffer && glsym_glUnmapBuffer)
@@ -3282,8 +3256,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3282 texuv2_ptr = texuv_ptr + TEX_SIZE; 3256 texuv2_ptr = texuv_ptr + TEX_SIZE;
3283 texuv3_ptr = texuv2_ptr + TEX_SIZE; 3257 texuv3_ptr = texuv2_ptr + TEX_SIZE;
3284 texa_ptr = texuv3_ptr + TEX_SIZE; 3258 texa_ptr = texuv3_ptr + TEX_SIZE;
3285 texsam_ptr = texa_ptr + TEX_SIZE; 3259 texm_ptr = texa_ptr + TEX_SIZE;
3286 texm_ptr = texsam_ptr + TEX_SIZE;
3287# define END_POINTER (texm_ptr + TEX_SIZE) 3260# define END_POINTER (texm_ptr + TEX_SIZE)
3288 3261
3289 glBindBuffer(GL_ARRAY_BUFFER, gc->pipe[i].array.buffer); 3262 glBindBuffer(GL_ARRAY_BUFFER, gc->pipe[i].array.buffer);
@@ -3311,12 +3284,10 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3311 memcpy(x + (unsigned long)texuv3_ptr, gc->pipe[i].array.texuv3, TEX_SIZE); 3284 memcpy(x + (unsigned long)texuv3_ptr, gc->pipe[i].array.texuv3, TEX_SIZE);
3312 if (gc->pipe[i].array.use_texa) 3285 if (gc->pipe[i].array.use_texa)
3313 memcpy(x + (unsigned long)texa_ptr, gc->pipe[i].array.texa, TEX_SIZE); 3286 memcpy(x + (unsigned long)texa_ptr, gc->pipe[i].array.texa, TEX_SIZE);
3314 if (gc->pipe[i].array.use_texsam)
3315 memcpy(x + (unsigned long)texsam_ptr, gc->pipe[i].array.texsam, TEX_SIZE);
3316 if (gc->pipe[i].array.use_texm) 3287 if (gc->pipe[i].array.use_texm)
3317 memcpy(x + (unsigned long)texm_ptr, gc->pipe[i].array.texm, TEX_SIZE); 3288 memcpy(x + (unsigned long)texm_ptr, gc->pipe[i].array.texm, TEX_SIZE);
3318/* 3289/*
3319 fprintf(stderr, "copy %i bytes [%i/%i slots] [%i + %i + %i + %i + %i + %i + %i] <%i %i %i %i %i %i %i>\n", 3290 fprintf(stderr, "copy %i bytes [%i/%i slots] [%i + %i + %i + %i + %i + %i + %i] <%i %i %i %i %i %i>\n",
3320 (int)((unsigned char *)END_POINTER), 3291 (int)((unsigned char *)END_POINTER),
3321 gc->pipe[i].array.num, 3292 gc->pipe[i].array.num,
3322 gc->pipe[i].array.alloc, 3293 gc->pipe[i].array.alloc,
@@ -3327,7 +3298,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3327 gc->pipe[i].array.use_texuv2, 3298 gc->pipe[i].array.use_texuv2,
3328 gc->pipe[i].array.use_texuv3, 3299 gc->pipe[i].array.use_texuv3,
3329 gc->pipe[i].array.use_texa, 3300 gc->pipe[i].array.use_texa,
3330 gc->pipe[i].array.use_texsam,
3331 gc->pipe[i].array.use_texm); 3301 gc->pipe[i].array.use_texm);
3332 */ 3302 */
3333 glsym_glUnmapBuffer(GL_ARRAY_BUFFER); 3303 glsym_glUnmapBuffer(GL_ARRAY_BUFFER);
@@ -3341,7 +3311,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3341 texuv2_ptr = (unsigned char *)gc->pipe[i].array.texuv2; 3311 texuv2_ptr = (unsigned char *)gc->pipe[i].array.texuv2;
3342 texuv3_ptr = (unsigned char *)gc->pipe[i].array.texuv3; 3312 texuv3_ptr = (unsigned char *)gc->pipe[i].array.texuv3;
3343 texa_ptr = (unsigned char *)gc->pipe[i].array.texa; 3313 texa_ptr = (unsigned char *)gc->pipe[i].array.texa;
3344 texsam_ptr = (unsigned char *)gc->pipe[i].array.texsam;
3345 texm_ptr = (unsigned char *)gc->pipe[i].array.texm; 3314 texm_ptr = (unsigned char *)gc->pipe[i].array.texm;
3346 } 3315 }
3347 glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, (void *)vertex_ptr); 3316 glVertexAttribPointer(SHAD_VERTEX, 3, GL_SHORT, GL_FALSE, 0, (void *)vertex_ptr);
@@ -3371,8 +3340,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3371 GLERR(__FUNCTION__, __FILE__, __LINE__, ""); 3340 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3372 glDisableVertexAttribArray(SHAD_TEXA); 3341 glDisableVertexAttribArray(SHAD_TEXA);
3373 GLERR(__FUNCTION__, __FILE__, __LINE__, ""); 3342 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3374 glDisableVertexAttribArray(SHAD_TEXSAM);
3375 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3376 glDisableVertexAttribArray(SHAD_TEXM); 3343 glDisableVertexAttribArray(SHAD_TEXM);
3377 GLERR(__FUNCTION__, __FILE__, __LINE__, ""); 3344 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3378 glDrawArrays(GL_LINES, 0, gc->pipe[i].array.num); 3345 glDrawArrays(GL_LINES, 0, gc->pipe[i].array.num);
@@ -3444,17 +3411,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3444 glDisableVertexAttribArray(SHAD_TEXA); 3411 glDisableVertexAttribArray(SHAD_TEXA);
3445 } 3412 }
3446 3413
3447 if (gc->pipe[i].array.use_texsam)
3448 {
3449 glEnableVertexAttribArray(SHAD_TEXSAM);
3450 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3451 glVertexAttribPointer(SHAD_TEXSAM, 2, GL_FLOAT, GL_FALSE, 0, (void *)texsam_ptr);
3452 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
3453 }
3454 else
3455 {
3456 glDisableVertexAttribArray(SHAD_TEXSAM);
3457 }
3458 if ((gc->pipe[i].array.use_texuv2) && (gc->pipe[i].array.use_texuv3)) 3414 if ((gc->pipe[i].array.use_texuv2) && (gc->pipe[i].array.use_texuv3))
3459 { 3415 {
3460 glEnableVertexAttribArray(SHAD_TEXUV2); 3416 glEnableVertexAttribArray(SHAD_TEXUV2);
@@ -3652,7 +3608,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3652 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa); 3608 if (gc->pipe[i].array.texa) free(gc->pipe[i].array.texa);
3653 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2); 3609 if (gc->pipe[i].array.texuv2) free(gc->pipe[i].array.texuv2);
3654 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3); 3610 if (gc->pipe[i].array.texuv3) free(gc->pipe[i].array.texuv3);
3655 if (gc->pipe[i].array.texsam) free(gc->pipe[i].array.texsam);
3656 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm); 3611 if (gc->pipe[i].array.texm) free(gc->pipe[i].array.texm);
3657 3612
3658 gc->pipe[i].array.line = 0; 3613 gc->pipe[i].array.line = 0;
@@ -3662,7 +3617,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3662 gc->pipe[i].array.use_texuv2 = 0; 3617 gc->pipe[i].array.use_texuv2 = 0;
3663 gc->pipe[i].array.use_texuv3 = 0; 3618 gc->pipe[i].array.use_texuv3 = 0;
3664 gc->pipe[i].array.use_texa = 0; 3619 gc->pipe[i].array.use_texa = 0;
3665 gc->pipe[i].array.use_texsam = 0;
3666 gc->pipe[i].array.use_texm = 0; 3620 gc->pipe[i].array.use_texm = 0;
3667 3621
3668 gc->pipe[i].array.vertex = NULL; 3622 gc->pipe[i].array.vertex = NULL;
@@ -3671,7 +3625,6 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3671 gc->pipe[i].array.texa = NULL; 3625 gc->pipe[i].array.texa = NULL;
3672 gc->pipe[i].array.texuv2 = NULL; 3626 gc->pipe[i].array.texuv2 = NULL;
3673 gc->pipe[i].array.texuv3 = NULL; 3627 gc->pipe[i].array.texuv3 = NULL;
3674 gc->pipe[i].array.texsam = NULL;
3675 gc->pipe[i].array.texm = NULL; 3628 gc->pipe[i].array.texm = NULL;
3676 3629
3677 gc->pipe[i].array.num = 0; 3630 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 d0648c6846..bc5010c5a6 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -77,7 +77,6 @@ _evas_gl_common_shader_program_binary_init(Evas_GL_Program *p,
77 glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2"); 77 glBindAttribLocation(p->prog, SHAD_TEXUV2, "tex_coord2");
78 glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3"); 78 glBindAttribLocation(p->prog, SHAD_TEXUV3, "tex_coord3");
79 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda"); 79 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda");
80 glBindAttribLocation(p->prog, SHAD_TEXSAM, "tex_sample");
81 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm"); 80 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm");
82 81
83 glGetProgramiv(p->prog, GL_LINK_STATUS, &ok); 82 glGetProgramiv(p->prog, GL_LINK_STATUS, &ok);
@@ -202,8 +201,6 @@ _evas_gl_common_shader_program_source_init(Evas_GL_Program *p,
202 GLERR(__FUNCTION__, __FILE__, __LINE__, ""); 201 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
203 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda"); 202 glBindAttribLocation(p->prog, SHAD_TEXA, "tex_coorda");
204 GLERR(__FUNCTION__, __FILE__, __LINE__, ""); 203 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
205 glBindAttribLocation(p->prog, SHAD_TEXSAM, "tex_sample");
206 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
207 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm"); 204 glBindAttribLocation(p->prog, SHAD_TEXM, "tex_coordm");
208 GLERR(__FUNCTION__, __FILE__, __LINE__, ""); 205 GLERR(__FUNCTION__, __FILE__, __LINE__, "");
209 206
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 712a84924e..50ed71249f 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 "attribute vec2 tex_sample;\n" 159 "uniform vec2 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, -tex_sample.y);\n" 168 " tex_s[0] = vec2(0, -sample.y);\n"
169 " tex_s[1] = vec2(0, tex_sample.y);\n" 169 " tex_s[1] = vec2(0, 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 "attribute vec2 tex_sample;\n" 186 "uniform vec2 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, -tex_sample.y);\n" 197 " tex_s[0] = vec2(0, -sample.y);\n"
198 " tex_s[1] = vec2(0, tex_sample.y);\n" 198 " tex_s[1] = vec2(0, 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 "attribute vec2 tex_sample;\n" 265 "uniform vec2 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, -tex_sample.y);\n" 274 " tex_s[0] = vec2(0, -sample.y);\n"
275 " tex_s[1] = vec2(0, tex_sample.y);\n" 275 " tex_s[1] = vec2(0, 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 "attribute vec2 tex_sample;\n" 292 "uniform vec2 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, -tex_sample.y);\n" 303 " tex_s[0] = vec2(0, -sample.y);\n"
304 " tex_s[1] = vec2(0, tex_sample.y);\n" 304 " tex_s[1] = vec2(0, 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 "attribute vec2 tex_sample;\n" 371 "uniform vec2 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(-tex_sample.x, 0);\n" 380 " tex_s[0] = vec2(-sample.x, 0);\n"
381 " tex_s[1] = vec2( tex_sample.x, 0);\n" 381 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 398 "uniform vec2 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(-tex_sample.x, 0);\n" 409 " tex_s[0] = vec2(-sample.x, 0);\n"
410 " tex_s[1] = vec2( tex_sample.x, 0);\n" 410 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 477 "uniform vec2 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(-tex_sample.x, 0);\n" 486 " tex_s[0] = vec2(-sample.x, 0);\n"
487 " tex_s[1] = vec2( tex_sample.x, 0);\n" 487 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 504 "uniform vec2 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(-tex_sample.x, 0);\n" 515 " tex_s[0] = vec2(-sample.x, 0);\n"
516 " tex_s[1] = vec2( tex_sample.x, 0);\n" 516 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 587 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 596 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
597 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 597 " tex_s[1] = vec2( sample.x, -sample.y);\n"
598 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 598 " tex_s[2] = vec2( sample.x, sample.y);\n"
599 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 599 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 616 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 627 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
628 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 628 " tex_s[1] = vec2( sample.x, -sample.y);\n"
629 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 629 " tex_s[2] = vec2( sample.x, sample.y);\n"
630 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 630 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 701 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 710 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
711 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 711 " tex_s[1] = vec2( sample.x, -sample.y);\n"
712 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 712 " tex_s[2] = vec2( sample.x, sample.y);\n"
713 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 713 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 730 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 741 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
742 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 742 " tex_s[1] = vec2( sample.x, -sample.y);\n"
743 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 743 " tex_s[2] = vec2( sample.x, sample.y);\n"
744 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 744 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 1213 "uniform vec2 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, -tex_sample.y);\n" 1224 " tex_s[0] = vec2(0, -sample.y);\n"
1225 " tex_s[1] = vec2(0, tex_sample.y);\n" 1225 " tex_s[1] = vec2(0, 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 "attribute vec2 tex_sample;\n" 1266 "uniform vec2 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, -tex_sample.y);\n" 1275 " tex_s[0] = vec2(0, -sample.y);\n"
1276 " tex_s[1] = vec2(0, tex_sample.y);\n" 1276 " tex_s[1] = vec2(0, 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 "attribute vec2 tex_sample;\n" 1319 "uniform vec2 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(-tex_sample.x, 0);\n" 1330 " tex_s[0] = vec2(-sample.x, 0);\n"
1331 " tex_s[1] = vec2( tex_sample.x, 0);\n" 1331 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 1372 "uniform vec2 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(-tex_sample.x, 0);\n" 1381 " tex_s[0] = vec2(-sample.x, 0);\n"
1382 " tex_s[1] = vec2( tex_sample.x, 0);\n" 1382 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 1427 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 1438 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
1439 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 1439 " tex_s[1] = vec2( sample.x, -sample.y);\n"
1440 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 1440 " tex_s[2] = vec2( sample.x, sample.y);\n"
1441 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 1441 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 1484 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 1493 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
1494 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 1494 " tex_s[1] = vec2( sample.x, -sample.y);\n"
1495 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 1495 " tex_s[2] = vec2( sample.x, sample.y);\n"
1496 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 1496 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 1674 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 1685 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
1686 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 1686 " tex_s[1] = vec2( sample.x, -sample.y);\n"
1687 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 1687 " tex_s[2] = vec2( sample.x, sample.y);\n"
1688 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 1688 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 1732 "uniform vec2 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(-tex_sample.x, 0);\n" 1743 " tex_s[0] = vec2(-sample.x, 0);\n"
1744 " tex_s[1] = vec2( tex_sample.x, 0);\n" 1744 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 1788 "uniform vec2 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, -tex_sample.y);\n" 1799 " tex_s[0] = vec2(0, -sample.y);\n"
1800 " tex_s[1] = vec2(0, tex_sample.y);\n" 1800 " tex_s[1] = vec2(0, 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 "attribute vec2 tex_sample;\n" 1844 "uniform vec2 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(-tex_sample.x, -tex_sample.y);\n" 1853 " tex_s[0] = vec2(-sample.x, -sample.y);\n"
1854 " tex_s[1] = vec2( tex_sample.x, -tex_sample.y);\n" 1854 " tex_s[1] = vec2( sample.x, -sample.y);\n"
1855 " tex_s[2] = vec2( tex_sample.x, tex_sample.y);\n" 1855 " tex_s[2] = vec2( sample.x, sample.y);\n"
1856 " tex_s[3] = vec2(-tex_sample.x, tex_sample.y);\n" 1856 " tex_s[3] = vec2(-sample.x, 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 "attribute vec2 tex_sample;\n" 1898 "uniform vec2 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(-tex_sample.x, 0);\n" 1907 " tex_s[0] = vec2(-sample.x, 0);\n"
1908 " tex_s[1] = vec2( tex_sample.x, 0);\n" 1908 " tex_s[1] = vec2( 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 "attribute vec2 tex_sample;\n" 1950 "uniform vec2 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, -tex_sample.y);\n" 1959 " tex_s[0] = vec2(0, -sample.y);\n"
1960 " tex_s[1] = vec2(0, tex_sample.y);\n" 1960 " tex_s[1] = vec2(0, 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 40144aae07..0d45f9890b 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;
6attribute vec2 tex_sample; 6uniform vec2 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, -tex_sample.y); 15 tex_s[0] = vec2(0, -sample.y);
16 tex_s[1] = vec2(0, tex_sample.y); 16 tex_s[1] = vec2(0, 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 810d73aaaa..df2b9f091f 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;
7attribute vec2 tex_sample; 7uniform vec2 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, -tex_sample.y); 18 tex_s[0] = vec2(0, -sample.y);
19 tex_s[1] = vec2(0, tex_sample.y); 19 tex_s[1] = vec2(0, 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 40144aae07..0d45f9890b 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;
6attribute vec2 tex_sample; 6uniform vec2 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, -tex_sample.y); 15 tex_s[0] = vec2(0, -sample.y);
16 tex_s[1] = vec2(0, tex_sample.y); 16 tex_s[1] = vec2(0, 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 810d73aaaa..df2b9f091f 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;
7attribute vec2 tex_sample; 7uniform vec2 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, -tex_sample.y); 18 tex_s[0] = vec2(0, -sample.y);
19 tex_s[1] = vec2(0, tex_sample.y); 19 tex_s[1] = vec2(0, 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 a6b149f5c5..ea6d9e07eb 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, 0); 15 tex_s[0] = vec2(-sample.x, 0);
16 tex_s[1] = vec2( tex_sample.x, 0); 16 tex_s[1] = vec2( 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 98d9154a73..915eb36629 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, 0); 18 tex_s[0] = vec2(-sample.x, 0);
19 tex_s[1] = vec2( tex_sample.x, 0); 19 tex_s[1] = vec2( 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 a6b149f5c5..ea6d9e07eb 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, 0); 15 tex_s[0] = vec2(-sample.x, 0);
16 tex_s[1] = vec2( tex_sample.x, 0); 16 tex_s[1] = vec2( 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 98d9154a73..915eb36629 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, 0); 18 tex_s[0] = vec2(-sample.x, 0);
19 tex_s[1] = vec2( tex_sample.x, 0); 19 tex_s[1] = vec2( 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 e6303d782d..b8c6dbfd83 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, -tex_sample.y); 15 tex_s[0] = vec2(-sample.x, -sample.y);
16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 16 tex_s[1] = vec2( sample.x, -sample.y);
17 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 17 tex_s[2] = vec2( sample.x, sample.y);
18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 18 tex_s[3] = vec2(-sample.x, 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 e964ea1e81..5816b96bb5 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, -tex_sample.y); 18 tex_s[0] = vec2(-sample.x, -sample.y);
19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 19 tex_s[1] = vec2( sample.x, -sample.y);
20 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 20 tex_s[2] = vec2( sample.x, sample.y);
21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 21 tex_s[3] = vec2(-sample.x, 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 e6303d782d..b8c6dbfd83 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, -tex_sample.y); 15 tex_s[0] = vec2(-sample.x, -sample.y);
16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 16 tex_s[1] = vec2( sample.x, -sample.y);
17 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 17 tex_s[2] = vec2( sample.x, sample.y);
18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 18 tex_s[3] = vec2(-sample.x, 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 e964ea1e81..5816b96bb5 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, -tex_sample.y); 18 tex_s[0] = vec2(-sample.x, -sample.y);
19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 19 tex_s[1] = vec2( sample.x, -sample.y);
20 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 20 tex_s[2] = vec2( sample.x, sample.y);
21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 21 tex_s[3] = vec2(-sample.x, 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 810d73aaaa..df2b9f091f 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;
7attribute vec2 tex_sample; 7uniform vec2 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, -tex_sample.y); 18 tex_s[0] = vec2(0, -sample.y);
19 tex_s[1] = vec2(0, tex_sample.y); 19 tex_s[1] = vec2(0, 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 40144aae07..0d45f9890b 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;
6attribute vec2 tex_sample; 6uniform vec2 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, -tex_sample.y); 15 tex_s[0] = vec2(0, -sample.y);
16 tex_s[1] = vec2(0, tex_sample.y); 16 tex_s[1] = vec2(0, 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 40144aae07..0d45f9890b 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;
6attribute vec2 tex_sample; 6uniform vec2 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, -tex_sample.y); 15 tex_s[0] = vec2(0, -sample.y);
16 tex_s[1] = vec2(0, tex_sample.y); 16 tex_s[1] = vec2(0, 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 810d73aaaa..df2b9f091f 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;
7attribute vec2 tex_sample; 7uniform vec2 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, -tex_sample.y); 18 tex_s[0] = vec2(0, -sample.y);
19 tex_s[1] = vec2(0, tex_sample.y); 19 tex_s[1] = vec2(0, 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 98d9154a73..915eb36629 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, 0); 18 tex_s[0] = vec2(-sample.x, 0);
19 tex_s[1] = vec2( tex_sample.x, 0); 19 tex_s[1] = vec2( 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 a6b149f5c5..ea6d9e07eb 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, 0); 15 tex_s[0] = vec2(-sample.x, 0);
16 tex_s[1] = vec2( tex_sample.x, 0); 16 tex_s[1] = vec2( 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 a6b149f5c5..ea6d9e07eb 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, 0); 15 tex_s[0] = vec2(-sample.x, 0);
16 tex_s[1] = vec2( tex_sample.x, 0); 16 tex_s[1] = vec2( 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 98d9154a73..915eb36629 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, 0); 18 tex_s[0] = vec2(-sample.x, 0);
19 tex_s[1] = vec2( tex_sample.x, 0); 19 tex_s[1] = vec2( 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 e964ea1e81..5816b96bb5 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, -tex_sample.y); 18 tex_s[0] = vec2(-sample.x, -sample.y);
19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 19 tex_s[1] = vec2( sample.x, -sample.y);
20 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 20 tex_s[2] = vec2( sample.x, sample.y);
21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 21 tex_s[3] = vec2(-sample.x, 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 e6303d782d..b8c6dbfd83 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, -tex_sample.y); 15 tex_s[0] = vec2(-sample.x, -sample.y);
16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 16 tex_s[1] = vec2( sample.x, -sample.y);
17 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 17 tex_s[2] = vec2( sample.x, sample.y);
18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 18 tex_s[3] = vec2(-sample.x, 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 e6303d782d..b8c6dbfd83 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;
6attribute vec2 tex_sample; 6uniform vec2 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(-tex_sample.x, -tex_sample.y); 15 tex_s[0] = vec2(-sample.x, -sample.y);
16 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 16 tex_s[1] = vec2( sample.x, -sample.y);
17 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 17 tex_s[2] = vec2( sample.x, sample.y);
18 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 18 tex_s[3] = vec2(-sample.x, 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 e964ea1e81..5816b96bb5 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;
7attribute vec2 tex_sample; 7uniform vec2 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(-tex_sample.x, -tex_sample.y); 18 tex_s[0] = vec2(-sample.x, -sample.y);
19 tex_s[1] = vec2( tex_sample.x, -tex_sample.y); 19 tex_s[1] = vec2( sample.x, -sample.y);
20 tex_s[2] = vec2( tex_sample.x, tex_sample.y); 20 tex_s[2] = vec2( sample.x, sample.y);
21 tex_s[3] = vec2(-tex_sample.x, tex_sample.y); 21 tex_s[3] = vec2(-sample.x, sample.y);
22 div_s = vec4(4, 4, 4, 4); 22 div_s = vec4(4, 4, 4, 4);
23} 23}
Copyright © Enlightenment.org