From 3da8d4ddc80e6ec5b7eb9eaa244ac739b5b8ba45 Mon Sep 17 00:00:00 2001 From: sunghyun kim Date: Fri, 11 Nov 2016 20:03:53 +0900 Subject: [PATCH] [evas-gl] fix texture offset for uploading Change-Id: I19076e86f732341d37f4dd66f80d3eabec2bf11d --- src/modules/evas/engines/gl_common/evas_gl_common.h | 2 +- src/modules/evas/engines/gl_common/evas_gl_texture.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 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 710c525..fed1932 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -158,7 +158,7 @@ struct _Evas_GL_Shared #define DEF_ATLAS_H 512 #define MAX_ATLAS_MEMCPY 1024 -#define DEF_ATLAS_MEMCPY 256 +#define DEF_ATLAS_MEMCPY 512 #define ATLAS_FORMATS_COUNT 12 diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c index 3eb0b70..c102f19 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_texture.c +++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c @@ -492,8 +492,6 @@ _pool_tex_find(Evas_Engine_GL_Context *gc, int w, int h, int wpadding, int hpadd (h > gc->shared->info.tune.atlas.max_h) || (!gc->shared->info.etc1_subimage && (intformat == etc1_fmt))) { - w -= wpadding; - h -= hpadding; pt = _pool_tex_new(gc, w, h, intformat, format); if (!pt) return NULL; gc->shared->tex.whole = eina_list_prepend(gc->shared->tex.whole, pt); @@ -596,13 +594,8 @@ evas_gl_common_texture_new(Evas_Engine_GL_Context *gc, RGBA_Image *im, Eina_Bool evas_gl_common_texture_light_free(tex); return NULL; } - tex->x = u; - tex->y = v; - if (!tex->pt->whole) - { - tex->x += xoffset; - tex->y += yoffset; - } + tex->x = u + xoffset; + tex->y = v + yoffset; tex->pt->references++; evas_gl_common_texture_update(tex, im); -- 2.7.4