diff options
| author | Daekwang Ryu <dkdk.ryu@samsung.com> | 2015-04-08 22:37:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2015-04-08 22:37:05 -0700 |
| commit | c15b562218d4c165c1aa137eda9cf3347f1ba16e (patch) | |
| tree | 7736dcddafba9e62b9c408a09255823dee335979 | |
| parent | c23b388c53559072743a13e377aa29423b868cf0 (diff) | |
| parent | e182886fa7fbf5496de56506af59a84d3a54f668 (diff) | |
| download | efl-c15b562218d4c165c1aa137eda9cf3347f1ba16e.tar.gz | |
Merge "Evas GL : Bugfix when using pixmap in native surface image" into tizen
| -rw-r--r-- | src/modules/evas/engines/gl_common/evas_gl_common.h | 2 | ||||
| -rw-r--r-- | src/modules/evas/engines/gl_common/evas_gl_context.c | 3 | ||||
| -rw-r--r-- | src/modules/evas/engines/gl_x11/evas_engine.c | 8 |
3 files changed, 11 insertions, 2 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 7d3c1d3d3b..f05e42ab7b 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -590,6 +590,8 @@ struct _Evas_GL_Image int target; int mipmap; unsigned char loose : 1; + //Tizen Only + unsigned char offbuffer : 1; } native; int scale_hint, content_hint; 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 51eff90b6b..9fb8be599f 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -1841,7 +1841,8 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc, } else { - if ((!tex->alpha) && (tex->pt->native)) + //Tizen Only : (!tex->im->native.offbuffer) + if ((!tex->alpha) && (tex->pt->native) && (!tex->im->native.offbuffer)) shader = evas_gl_common_shader_choice(0, NULL, r, g, b, a, !!mtex, SHADER_TEX_NOMUL_AFILL, SHADER_TEX_AFILL, SHADER_IMG_MASK_NOMUL, SHADER_IMG_MASK); diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 3d6f45c9fe..7467045c91 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -2188,6 +2188,8 @@ eng_image_native_set(void *data, void *image, void *native) im->native.func.free = _native_free_cb; im->native.target = GL_TEXTURE_2D; im->native.mipmap = 0; + //Tizen Only + im->native.offbuffer = 1; glsym_evas_gl_common_image_native_enable(im); } } @@ -2393,7 +2395,9 @@ eng_image_native_set(void *data, void *image, void *native) im->native.func.bind = _native_bind_cb; im->native.func.unbind = _native_unbind_cb; im->native.func.free = _native_free_cb; - + //Tizen Only + im->native.offbuffer = 0; + glsym_evas_gl_common_image_native_enable(im); } } @@ -2430,6 +2434,8 @@ eng_image_native_set(void *data, void *image, void *native) im->native.func.free = _native_free_cb; im->native.target = GL_TEXTURE_2D; im->native.mipmap = 0; + //Tizen Only + im->native.offbuffer = 0; // FIXME: need to implement mapping sub texture regions // x, y, w, h for possible texture atlasing |