summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongyeon Kim <dy5.kim@samsung.com>2015-11-11 16:15:24 +0900
committerDongyeon Kim <dy5.kim@samsung.com>2015-11-12 08:56:29 +0900
commit3d97c4c5a8789f1cf9bc338f09d4412bde28676f (patch)
tree6c5c52cf9f6cee7357ad676c6b9810c31ef3c7da
parent93f45eedcfcb066ae1a4829a0f559979f62e71ec (diff)
Revert "Evas GL: Fix crash with dynamic hint set using tbm surface"
Upcoming patch will fix this crash issue in a more proper way, so I revert this patch here. This reverts commit 8b1b8d5cf04f5e176cc4de6c04790e90eeac4ff2.
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 6646a29f63..2d8d936e2a 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -622,10 +622,6 @@ evas_gl_common_image_content_hint_set(Evas_GL_Image *im, int hint)
622 } 622 }
623 if (im->content_hint == EVAS_IMAGE_CONTENT_HINT_DYNAMIC) 623 if (im->content_hint == EVAS_IMAGE_CONTENT_HINT_DYNAMIC)
624 { 624 {
625 Evas_GL_Texture *tex;
626 tex = evas_gl_common_texture_dynamic_new(im->gc, im);
627 if (!tex) return;
628
629 if (im->cs.data) 625 if (im->cs.data)
630 { 626 {
631 if (!im->cs.no_free) free(im->cs.data); 627 if (!im->cs.no_free) free(im->cs.data);
@@ -654,7 +650,7 @@ evas_gl_common_image_content_hint_set(Evas_GL_Image *im, int hint)
654 evas_gl_common_texture_free(im->tex, EINA_TRUE); 650 evas_gl_common_texture_free(im->tex, EINA_TRUE);
655 im->tex = NULL; 651 im->tex = NULL;
656 } 652 }
657 im->tex = tex; 653 im->tex = evas_gl_common_texture_dynamic_new(im->gc, im);
658 im->tex_only = 1; 654 im->tex_only = 1;
659 } 655 }
660 else 656 else