diff options
author | Cedric Bail <cedric.bail@samsung.com> | 2013-11-15 14:07:45 +0900 |
---|---|---|
committer | Cedric Bail <cedric.bail@samsung.com> | 2013-11-15 14:08:44 +0900 |
commit | d3022ad700a5b75c8c758db551b8848d3b8563c9 (patch) | |
tree | b1cb86c18c8620245240a6ca869ed0535b7eb5c5 | |
parent | d2b647d2b378a88bee07610a7416d4257bbebbb6 (diff) |
evas: fix potential similar problem as with GL X11 backend with wrong context being used.
See commit d2b647d2b378a88bee07610a7416d4257bbebbb6.
-rw-r--r-- | src/modules/evas/engines/wayland_egl/evas_engine.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index a68981c180..67c6e153c0 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c | |||
@@ -2312,10 +2312,13 @@ eng_image_cache_flush(void *data) | |||
2312 | Render_Engine *re; | 2312 | Render_Engine *re; |
2313 | int tmp_size; | 2313 | int tmp_size; |
2314 | 2314 | ||
2315 | re = (Render_Engine *)data; | ||
2316 | |||
2317 | if (re) eng_window_use(re->win); | ||
2318 | |||
2315 | tmp_size = evas_common_image_get_cache(); | 2319 | tmp_size = evas_common_image_get_cache(); |
2316 | evas_common_image_set_cache(0); | 2320 | evas_common_image_set_cache(0); |
2317 | evas_common_rgba_image_scalecache_flush(); | 2321 | evas_common_rgba_image_scalecache_flush(); |
2318 | re = (Render_Engine *)data; | ||
2319 | evas_gl_common_image_cache_flush(re->win->gl_context); | 2322 | evas_gl_common_image_cache_flush(re->win->gl_context); |
2320 | // if ((re = (Render_Engine *)data)) | 2323 | // if ((re = (Render_Engine *)data)) |
2321 | // evas_gl_common_image_cache_flush(re->win->gl_context); | 2324 | // evas_gl_common_image_cache_flush(re->win->gl_context); |
@@ -2327,9 +2330,12 @@ eng_image_cache_set(void *data, int bytes) | |||
2327 | { | 2330 | { |
2328 | Render_Engine *re; | 2331 | Render_Engine *re; |
2329 | 2332 | ||
2333 | re = (Render_Engine *)data; | ||
2334 | |||
2335 | if (re) eng_window_use(re->win); | ||
2336 | |||
2330 | evas_common_image_set_cache(bytes); | 2337 | evas_common_image_set_cache(bytes); |
2331 | evas_common_rgba_image_scalecache_size_set(bytes); | 2338 | evas_common_rgba_image_scalecache_size_set(bytes); |
2332 | re = (Render_Engine *)data; | ||
2333 | evas_gl_common_image_cache_flush(re->win->gl_context); | 2339 | evas_gl_common_image_cache_flush(re->win->gl_context); |
2334 | // if (!(re = (Render_Engine *)data)) return; | 2340 | // if (!(re = (Render_Engine *)data)) return; |
2335 | // if (re->win) evas_gl_common_image_cache_flush(re->win->gl_context); | 2341 | // if (re->win) evas_gl_common_image_cache_flush(re->win->gl_context); |