evas - .... I forgot vincent's work. next time.

SVN revision: 78883

2 files changed, 23 insertions, 19 deletions

diff --git a/legacy/evas/src/bin/evas_cserve2_slaves.c b/legacy/evas/src/bin/evas_cserve2_slaves.c
index 4a5d6ac1b0..542a4fb4fe 100644
--- a/legacy/evas/src/bin/evas_cserve2_slaves.c
+++ b/legacy/evas/src/bin/evas_cserve2_slaves.c
@@ -320,6 +320,7 @@ static const char *
 _slave_proc_path_get(const char *name)
 {
    char buf[PATH_MAX], cwd[PATH_MAX];
+   char *ret;
 
    if (name[0] == '/')
      {
@@ -328,7 +329,7 @@ _slave_proc_path_get(const char *name)
         return eina_stringshare_add(name);
      }
 
-   getcwd(cwd, sizeof(cwd));
+   ret = getcwd(cwd, sizeof(cwd));
    snprintf(buf, sizeof(buf), "%s/%s", cwd, name);
    if (!access(buf, X_OK))
      return eina_stringshare_add(buf);
@@ -453,6 +454,7 @@ static void *
 _slave_thread_cb(void *data)
 {
    ssize_t n;
+   int ret;
    Slave_Command cmd;
 
    Slave_Thread_Data *sd = data;
@@ -475,7 +477,7 @@ _slave_thread_cb(void *data)
              continue;
           }
         sd->cmdanswer = sd->cb(sd, &cmd, sd->cmddata, sd->cb_data);
-        write(sd->write_fd, &cmd, sizeof(cmd));
+        ret = write(sd->write_fd, &cmd, sizeof(cmd));
 
         n = read(sd->read_fd, &cmd, sizeof(cmd));
      }
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,
                                  int clip, int cx, int cy, int cw, int ch,
                                  int r, int g, int b, int a)
 {
-   int pnum, nv, nc, i;
+   int pnum, nv, nc, nu, nt, i;
    Eina_Bool blend = 0;
    GLuint prog = gc->shared->shader[SHADER_RECT].prog;
    int pn = 0;
@@ -1295,7 +1295,7 @@ evas_gl_common_context_line_push(Evas_Engine_GL_Context *gc,
    gc->pipe[pn].array.use_texuv3 = 0;
 
    pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4;
+   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
    gc->pipe[pn].array.num += 2;
    array_alloc(gc, pn);
 
@@ -1321,7 +1321,7 @@ evas_gl_common_context_rectangle_push(Evas_Engine_GL_Context *gc,
                                       int x, int y, int w, int h,
                                       int r, int g, int b, int a)
 {
-   int pnum, nv, nc, i;
+   int pnum, nv, nc, nu, nt, i;
    Eina_Bool blend = 0;
    GLuint prog = gc->shared->shader[SHADER_RECT].prog;
    int pn = 0;
@@ -1447,7 +1447,7 @@ again:
    pipe_region_expand(gc, pn, x, y, w, h);
 
    pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4;
+   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);
 
@@ -1473,7 +1473,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
                                   int r, int g, int b, int a,
                                   Eina_Bool smooth, Eina_Bool tex_only)
 {
-   int pnum, nv, nc, nu, i;
+   int pnum, nv, nc, nu, nu2, nt, i;
    GLfloat tx1, tx2, ty1, ty2;
    Eina_Bool blend = 1;
    GLuint prog = gc->shared->shader[SHADER_IMG].prog;
@@ -1543,7 +1543,8 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
    pipe_region_expand(gc, pn, x, y, w, h);
 
    pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
+   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nu2 = pnum * 2;
+   nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);
 
@@ -1595,7 +1596,7 @@ evas_gl_common_context_image_mask_push(Evas_Engine_GL_Context *gc,
                                   int r, int g, int b, int a,
                                   Eina_Bool smooth)
 {
-   int pnum, nv, nc, nu, nm, i;
+   int pnum, nv, nc, nu, nm, nt, i;
    GLfloat tx1, tx2, ty1, ty2;
    GLfloat txm1, txm2, tym1, tym2;
    Eina_Bool blend = 1;
@@ -1648,6 +1649,7 @@ evas_gl_common_context_image_mask_push(Evas_Engine_GL_Context *gc,
 
    pnum = gc->pipe[pn].array.num;
    nv = pnum * 3; nc = pnum * 4; nm = pnum * 2; nu = pnum * 2;
+   nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);
 
@@ -1719,7 +1721,7 @@ evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
                                  int x, int y, int w, int h,
                                  int r, int g, int b, int a)
 {
-   int pnum, nv, nc, nu, i;
+   int pnum, nv, nc, nu, nt, i;
    GLfloat tx1, tx2, ty1, ty2;
    GLuint prog = gc->shared->shader[SHADER_FONT].prog;
    int pn = 0;
@@ -1753,7 +1755,7 @@ evas_gl_common_context_font_push(Evas_Engine_GL_Context *gc,
    pipe_region_expand(gc, pn, x, y, w, h);
 
    pnum = gc->pipe[pn].array.num;
-   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
+   nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);
 
@@ -1802,7 +1804,7 @@ evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
                                 int r, int g, int b, int a,
                                 Eina_Bool smooth)
 {
-   int pnum, nv, nc, nu, nu2, nu3, i;
+   int pnum, nv, nc, nu, nu2, nu3, nt, i;
    GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
    Eina_Bool blend = 0;
    GLuint prog;
@@ -1845,7 +1847,7 @@ evas_gl_common_context_yuv_push(Evas_Engine_GL_Context *gc,
 
    pnum = gc->pipe[pn].array.num;
    nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
-   nu2 = pnum * 2; nu3 = pnum * 2;
+   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);
 
@@ -1905,7 +1907,7 @@ evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
                                  int r, int g, int b, int a,
                                  Eina_Bool smooth)
 {
-   int pnum, nv, nc, nu, nu2, i;
+   int pnum, nv, nc, nu, nu2, nu3, nt, i;
    GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
    Eina_Bool blend = 0;
    GLuint prog;
@@ -1947,7 +1949,7 @@ evas_gl_common_context_yuy2_push(Evas_Engine_GL_Context *gc,
 
    pnum = gc->pipe[pn].array.num;
    nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
-   nu2 = pnum * 2;
+   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);
 
@@ -1999,7 +2001,7 @@ evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
                                  int r, int g, int b, int a,
                                  Eina_Bool smooth)
 {
-   int pnum, nv, nc, nu, nu2, i;
+   int pnum, nv, nc, nu, nu2, nu3, nt, i;
    GLfloat tx1, tx2, ty1, ty2, t2x1, t2x2, t2y1, t2y2;
    Eina_Bool blend = 0;
    GLuint prog;
@@ -2043,7 +2045,7 @@ evas_gl_common_context_nv12_push(Evas_Engine_GL_Context *gc,
 
    pnum = gc->pipe[pn].array.num;
    nv = pnum * 3; nc = pnum * 4; nu = pnum * 2;
-   nu2 = pnum * 2;
+   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);
 
@@ -2097,7 +2099,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
                                       Eina_Bool smooth, Eina_Bool tex_only,
                                       Evas_Colorspace cspace)
 {
-   int pnum, nv, nc, nu, nu2, nu3, i;
+   int pnum, nv, nc, nu, nu2, nu3, nt, i;
    const int points[6] = { 0, 1, 2, 0, 2, 3 };
    int x = 0, y = 0, w = 0, h = 0, px = 0, py = 0;
    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,
 
    pnum = gc->pipe[pn].array.num;
    nv = pnum * 3; nc = pnum * 4; nu = pnum * 2; nu2 = pnum * 2;
-   nu2 = pnum * 2; nu3 = pnum * 2;
+   nu2 = pnum * 2; nu3 = pnum * 2; nt = pnum * 4;
    gc->pipe[pn].array.num += 6;
    array_alloc(gc, pn);