summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/gl_common/evas_gl_texture.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-03-04 17:11:26 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-03-04 17:31:31 +0900
commitf020171bf2fca0c2f30199904798b79dba929c65 (patch)
tree32af72903be3866c38de77a2d0e88e84706f6746 /src/modules/evas/engines/gl_common/evas_gl_texture.c
parent53d3cb4fec32d7876aba1c878501fe7ca9e06c46 (diff)
Evas GL common: Disable evas gl preload by default
Unfortunately, this "feature" has many problems and does not really fix those it was supposed to address: - Elm Photocam becomes horrible to use (the transition from low-res to high-res tiles triggers this miniature path). - Evas async preload callback is called before the full image is ready (ie. the texture is not uploaded yet), when really the preload callback should be triggered only once the image is 100% ready. (TODO) - Sometimes the miniature image keeps being used even though the main image has been uploaded (eg. with E background). Maybe the object image is not redrawn when it should. - This uses a separate thread for the upload, which is both a good and bad idea because we need to do a make current. Also, this does not upload the full-res image tile by tile, but only in one pass, thus blocking the render loop until finished. This patch changes the env var from "EVAS_GL_NOPRELOAD" to "EVAS_GL_PRELOAD" (and only "1" will enable). Sorry Cedric, we can talk later about how to improve this.
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c5
1 files changed, 4 insertions, 1 deletions
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 6c3b0343a6..4f0c0b3e24 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -1267,7 +1267,10 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
1267 } 1267 }
1268 1268
1269 // if preloaded, then async push it in after uploading a miniature of it 1269 // if preloaded, then async push it in after uploading a miniature of it
1270 if (im->cache_entry.flags.preload_done && tex->w > 2 * EVAS_GL_TILE_SIZE && tex->h > 2 * EVAS_GL_TILE_SIZE) 1270 if (im->cache_entry.flags.preload_done
1271 && (tex->w > (2 * EVAS_GL_TILE_SIZE))
1272 && (tex->h > (2 * EVAS_GL_TILE_SIZE))
1273 && evas_gl_preload_enabled())
1271 { 1274 {
1272 Evas_GL_Texture_Async_Preload *async; 1275 Evas_GL_Texture_Async_Preload *async;
1273 unsigned char *in; 1276 unsigned char *in;