summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-11-03 13:29:13 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-11-03 13:29:13 +0000
commit6151a422e089313bcfb1b5a113396f93f7e410fd (patch)
tree6afbf99bcbe2fcc142e36b75a2a2c5bdc5fceb06 /legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
parent3b74ce2dbd16748917fd26175eb266889230a0be (diff)
evas - .... I forgot vincent's work. next time.
SVN revision: 78883
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/modules/engines/gl_common/evas_gl_context.c36
1 files changed, 19 insertions, 17 deletions
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
index 1b05c3db9e..38115fc7f8 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
+++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
@@ -1266,7 +1266,7 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
1266 int clip, int cx, int cy, int cw, int ch, 1266 int clip, int cx, int cy, int cw, int ch,
1267 int r, int g, int b, int a) 1267 int r, int g, int b, int a)
1268{ 1268{
1269 int pnum, nv, nc, i; 1269 int pnum, nv, nc, nu, nt, i;
1270 Eina_Bool blend = 0; 1270 Eina_Bool blend = 0;
1271 GLuint prog = gc->shared->shader[SHADER_RECT].prog; 1271 GLuint prog = gc->shared->shader[SHADER_RECT].prog;
1272 int pn = 0; 1272 int pn = 0;
@@ -1295,7 +1295,7 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
1295 gc->pipe[pn].array.use_texuv3 = 0; 1295 gc->pipe[pn].array.use_texuv3 = 0;
1296 1296
1297 pnum = gc->pipe[pn].array.num; 1297 pnum = gc->pipe[pn].array.num;
1298 nv = pnum * 3; nc = pnum * 4; 1298 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
1299 gc->pipe[pn].array.num += 2; 1299 gc->pipe[pn].array.num += 2;
1300 array_alloc(gc, pn); 1300 array_alloc(gc, pn);
1301 1301
@@ -1321,7 +1321,7 @@ evas_gl_common_context_rectangle_push(Evas_Engine_GL_Context *gc,
1321 int x, int y, int w, int h, 1321 int x, int y, int w, int h,
1322 int r, int g, int b, int a) 1322 int r, int g, int b, int a)
1323{ 1323{
1324 int pnum, nv, nc, i; 1324 int pnum, nv, nc, nu, nt, i;
1325 Eina_Bool blend = 0; 1325 Eina_Bool blend = 0;
1326 GLuint prog = gc->shared->shader[SHADER_RECT].prog; 1326 GLuint prog = gc->shared->shader[SHADER_RECT].prog;
1327 int pn = 0; 1327 int pn = 0;
@@ -1447,7 +1447,7 @@ again:
1447 pipe_region_expand(gc, pn, x, y, w, h); 1447 pipe_region_expand(gc, pn, x, y, w, h);
1448 1448
1449 pnum = gc->pipe[pn].array.num; 1449 pnum = gc->pipe[pn].array.num;
1450 nv = pnum * 3; nc = pnum * 4; 1450 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
1451 gc->pipe[pn].array.num += 6; 1451 gc->pipe[pn].array.num += 6;
1452 array_alloc(gc, pn); 1452 array_alloc(gc, pn);
1453 1453
@@ -1473,7 +1473,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
1473 int r, int g, int b, int a, 1473 int r, int g, int b, int a,
1474 Eina_Bool smooth, Eina_Bool tex_only) 1474 Eina_Bool smooth, Eina_Bool tex_only)
1475{ 1475{
1476 int pnum, nv, nc, nu, i; 1476 int pnum, nv, nc, nu, nu2, nt, i;
1477 GLfloat tx1, tx2, ty1, ty2; 1477 GLfloat tx1, tx2, ty1, ty2;
1478 Eina_Bool blend = 1; 1478 Eina_Bool blend = 1;
1479 GLuint prog = gc->shared->shader[SHADER_IMG].prog; 1479 GLuint prog = gc->shared->shader[SHADER_IMG].prog;
@@ -1543,7 +1543,8 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
1543 pipe_region_expand(gc, pn, x, y, w, h); 1543 pipe_region_expand(gc, pn, x, y, w, h);
1544 1544
1545 pnum = gc->pipe[pn].array.num; 1545 pnum = gc->pipe[pn].array.num;
1546 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; 1546 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nu2 = pnum * 2;
1547 nt = pnum * 4;
1547 gc->pipe[pn].array.num += 6; 1548 gc->pipe[pn].array.num += 6;
1548 array_alloc(gc, pn); 1549 array_alloc(gc, pn);
1549 1550
@@ -1595,7 +1596,7 @@ evas_gl_common_context_image_mask_push(Evas_Engine_GL_Context *gc,
1595 int r, int g, int b, int a, 1596 int r, int g, int b, int a,
1596 Eina_Bool smooth) 1597 Eina_Bool smooth)
1597{ 1598{
1598 int pnum, nv, nc, nu, nm, i; 1599 int pnum, nv, nc, nu, nm, nt, i;
1599 GLfloat tx1, tx2, ty1, ty2; 1600 GLfloat tx1, tx2, ty1, ty2;
1600 GLfloat txm1, txm2, tym1, tym2; 1601 GLfloat txm1, txm2, tym1, tym2;
1601 Eina_Bool blend = 1; 1602 Eina_Bool blend = 1;
@@ -1648,6 +1649,7 @@ evas_gl_common_context_image_mask_push(Evas_Engine_GL_Context *gc,
1648 1649
1649 pnum = gc->pipe[pn].array.num; 1650 pnum = gc->pipe[pn].array.num;
1650 nv = pnum * 3; nc = pnum * 4; nm = pnum * 2; nu = pnum * 2; 1651 nv = pnum * 3; nc = pnum * 4; nm = pnum * 2; nu = pnum * 2;
1652 nt = pnum * 4;
1651 gc->pipe[pn].array.num += 6; 1653 gc->pipe[pn].array.num += 6;
1652 array_alloc(gc, pn); 1654 array_alloc(gc, pn);
1653 1655
@@ -1719,7 +1721,7 @@ evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
1719 int x, int y, int w, int h, 1721 int x, int y, int w, int h,
1720 int r, int g, int b, int a) 1722 int r, int g, int b, int a)
1721{ 1723{
1722 int pnum, nv, nc, nu, i; 1724 int pnum, nv, nc, nu, nt, i;
1723 GLfloat tx1, tx2, ty1, ty2; 1725 GLfloat tx1, tx2, ty1, ty2;
1724 GLuint prog = gc->shared->shader[SHADER_FONT].prog; 1726 GLuint prog = gc->shared->shader[SHADER_FONT].prog;
1725 int pn = 0; 1727 int pn = 0;
@@ -1753,7 +1755,7 @@ evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
1753 pipe_region_expand(gc, pn, x, y, w, h); 1755 pipe_region_expand(gc, pn, x, y, w, h);
1754 1756
1755 pnum = gc->pipe[pn].array.num; 1757 pnum = gc->pipe[pn].array.num;
1756 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; 1758 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
1757 gc->pipe[pn].array.num += 6; 1759 gc->pipe[pn].array.num += 6;
1758 array_alloc(gc, pn); 1760 array_alloc(gc, pn);
1759 1761
@@ -1802,7 +1804,7 @@ evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
1802 int r, int g, int b, int a, 1804 int r, int g, int b, int a,
1803 Eina_Bool smooth) 1805 Eina_Bool smooth)
1804{ 1806{
1805 int pnum, nv, nc, nu, nu2, nu3, i; 1807 int pnum, nv, nc, nu, nu2, nu3, nt, i;
1806 GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2; 1808 GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
1807 Eina_Bool blend = 0; 1809 Eina_Bool blend = 0;
1808 GLuint prog; 1810 GLuint prog;
@@ -1845,7 +1847,7 @@ evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
1845 1847
1846 pnum = gc->pipe[pn].array.num; 1848 pnum = gc->pipe[pn].array.num;
1847 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; 1849 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
1848 nu2 = pnum * 2; nu3 = pnum * 2; 1850 nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
1849 gc->pipe[pn].array.num += 6; 1851 gc->pipe[pn].array.num += 6;
1850 array_alloc(gc, pn); 1852 array_alloc(gc, pn);
1851 1853
@@ -1905,7 +1907,7 @@ evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
1905 int r, int g, int b, int a, 1907 int r, int g, int b, int a,
1906 Eina_Bool smooth) 1908 Eina_Bool smooth)
1907{ 1909{
1908 int pnum, nv, nc, nu, nu2, i; 1910 int pnum, nv, nc, nu, nu2, nu3, nt, i;
1909 GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2; 1911 GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
1910 Eina_Bool blend = 0; 1912 Eina_Bool blend = 0;
1911 GLuint prog; 1913 GLuint prog;
@@ -1947,7 +1949,7 @@ evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
1947 1949
1948 pnum = gc->pipe[pn].array.num; 1950 pnum = gc->pipe[pn].array.num;
1949 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; 1951 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
1950 nu2 = pnum * 2; 1952 nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
1951 gc->pipe[pn].array.num += 6; 1953 gc->pipe[pn].array.num += 6;
1952 array_alloc(gc, pn); 1954 array_alloc(gc, pn);
1953 1955
@@ -1999,7 +2001,7 @@ evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
1999 int r, int g, int b, int a, 2001 int r, int g, int b, int a,
2000 Eina_Bool smooth) 2002 Eina_Bool smooth)
2001{ 2003{
2002 int pnum, nv, nc, nu, nu2, i; 2004 int pnum, nv, nc, nu, nu2, nu3, nt, i;
2003 GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2; 2005 GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
2004 Eina_Bool blend = 0; 2006 Eina_Bool blend = 0;
2005 GLuint prog; 2007 GLuint prog;
@@ -2043,7 +2045,7 @@ evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
2043 2045
2044 pnum = gc->pipe[pn].array.num; 2046 pnum = gc->pipe[pn].array.num;
2045 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; 2047 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
2046 nu2 = pnum * 2; 2048 nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
2047 gc->pipe[pn].array.num += 6; 2049 gc->pipe[pn].array.num += 6;
2048 array_alloc(gc, pn); 2050 array_alloc(gc, pn);
2049 2051
@@ -2097,7 +2099,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
2097 Eina_Bool smooth, Eina_Bool tex_only, 2099 Eina_Bool smooth, Eina_Bool tex_only,
2098 Evas_Colorspace cspace) 2100 Evas_Colorspace cspace)
2099{ 2101{
2100 int pnum, nv, nc, nu, nu2, nu3, i; 2102 int pnum, nv, nc, nu, nu2, nu3, nt, i;
2101 const int points[6] = { 0, 1, 2, 0, 2, 3 }; 2103 const int points[6] = { 0, 1, 2, 0, 2, 3 };
2102 int x = 0, y = 0, w = 0, h = 0, px = 0, py = 0; 2104 int x = 0, y = 0, w = 0, h = 0, px = 0, py = 0;
2103 GLfloat tx[4], ty[4], t2x[4], t2y[4]; 2105 GLfloat tx[4], ty[4], t2x[4], t2y[4];
@@ -2285,7 +2287,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
2285 2287
2286 pnum = gc->pipe[pn].array.num; 2288 pnum = gc->pipe[pn].array.num;
2287 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nu2 = pnum * 2; 2289 nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nu2 = pnum * 2;
2288 nu2 = pnum * 2; nu3 = pnum * 2; 2290 nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
2289 gc->pipe[pn].array.num += 6; 2291 gc->pipe[pn].array.num += 6;
2290 array_alloc(gc, pn); 2292 array_alloc(gc, pn);
2291 2293