aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/evas/src/lib/cache
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--libraries/evas/src/lib/cache/Makefile.in8
-rw-r--r--libraries/evas/src/lib/cache/evas_cache_engine_image.c4
-rw-r--r--libraries/evas/src/lib/cache/evas_cache_image.c17
-rw-r--r--libraries/evas/src/lib/cache/evas_preload.c4
4 files changed, 18 insertions, 15 deletions
diff --git a/libraries/evas/src/lib/cache/Makefile.in b/libraries/evas/src/lib/cache/Makefile.in
index b024731..2b50c81 100644
--- a/libraries/evas/src/lib/cache/Makefile.in
+++ b/libraries/evas/src/lib/cache/Makefile.in
@@ -197,8 +197,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
197PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ 197PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
198PIXMAN_LIBS = @PIXMAN_LIBS@ 198PIXMAN_LIBS = @PIXMAN_LIBS@
199PKG_CONFIG = @PKG_CONFIG@ 199PKG_CONFIG = @PKG_CONFIG@
200PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
201PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
202PNG_CFLAGS = @PNG_CFLAGS@ 200PNG_CFLAGS = @PNG_CFLAGS@
203PNG_LIBS = @PNG_LIBS@ 201PNG_LIBS = @PNG_LIBS@
204RANLIB = @RANLIB@ 202RANLIB = @RANLIB@
@@ -215,6 +213,8 @@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
215VALGRIND_LIBS = @VALGRIND_LIBS@ 213VALGRIND_LIBS = @VALGRIND_LIBS@
216VERSION = @VERSION@ 214VERSION = @VERSION@
217VMAJ = @VMAJ@ 215VMAJ = @VMAJ@
216WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
217WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
218WIN32_CFLAGS = @WIN32_CFLAGS@ 218WIN32_CFLAGS = @WIN32_CFLAGS@
219WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ 219WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
220XCB_CFLAGS = @XCB_CFLAGS@ 220XCB_CFLAGS = @XCB_CFLAGS@
@@ -296,6 +296,10 @@ evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
296evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ 296evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
297evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ 297evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
298evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@ 298evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
299evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
300evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
301evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
302evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
299evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@ 303evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
300evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@ 304evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
301evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@ 305evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
diff --git a/libraries/evas/src/lib/cache/evas_cache_engine_image.c b/libraries/evas/src/lib/cache/evas_cache_engine_image.c
index 8ae4392..5ec1af2 100644
--- a/libraries/evas/src/lib/cache/evas_cache_engine_image.c
+++ b/libraries/evas/src/lib/cache/evas_cache_engine_image.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
1#include <assert.h> 5#include <assert.h>
2 6
3#include "evas_common.h" 7#include "evas_common.h"
diff --git a/libraries/evas/src/lib/cache/evas_cache_image.c b/libraries/evas/src/lib/cache/evas_cache_image.c
index d52c64e..73e4f8a 100644
--- a/libraries/evas/src/lib/cache/evas_cache_image.c
+++ b/libraries/evas/src/lib/cache/evas_cache_image.c
@@ -918,12 +918,8 @@ evas_cache_image_drop(Image_Entry *im)
918EAPI void 918EAPI void
919evas_cache_image_data_not_needed(Image_Entry *im) 919evas_cache_image_data_not_needed(Image_Entry *im)
920{ 920{
921 Evas_Cache_Image *cache;
922 int references; 921 int references;
923 922
924 /* FIXME: no one uses this api... well evas_cache_engine_parent_not_needed()
925 * does, but nothing uses that! */
926 cache = im->cache;
927#ifdef EVAS_FRAME_QUEUING 923#ifdef EVAS_FRAME_QUEUING
928 LKL(im->lock_references); 924 LKL(im->lock_references);
929#endif 925#endif
@@ -941,11 +937,12 @@ evas_cache_image_dirty(Image_Entry *im, unsigned int x, unsigned int y, unsigned
941{ 937{
942 Image_Entry *im_dirty = im; 938 Image_Entry *im_dirty = im;
943 Evas_Cache_Image *cache; 939 Evas_Cache_Image *cache;
944 int references;
945 940
946 cache = im->cache; 941 cache = im->cache;
947 if (!(im->flags.dirty)) 942 if (!(im->flags.dirty))
948 { 943 {
944#ifndef EVAS_CSERVE
945 int references;
949#ifdef EVAS_FRAME_QUEUING 946#ifdef EVAS_FRAME_QUEUING
950 LKL(im->lock_references); 947 LKL(im->lock_references);
951#endif 948#endif
@@ -953,21 +950,18 @@ evas_cache_image_dirty(Image_Entry *im, unsigned int x, unsigned int y, unsigned
953#ifdef EVAS_FRAME_QUEUING 950#ifdef EVAS_FRAME_QUEUING
954 LKU(im->lock_references); 951 LKU(im->lock_references);
955#endif 952#endif
956#ifndef EVAS_CSERVE
957 // if ref 1 also copy if using shared cache as its read-only 953 // if ref 1 also copy if using shared cache as its read-only
958 if (references == 1) im_dirty = im; 954 if (references == 1) im_dirty = im;
959 else 955 else
960#endif 956#endif
961 { 957 {
962 int error;
963
964 im_dirty = 958 im_dirty =
965 evas_cache_image_copied_data(cache, im->w, im->h, 959 evas_cache_image_copied_data(cache, im->w, im->h,
966 evas_cache_image_pixels(im), 960 evas_cache_image_pixels(im),
967 im->flags.alpha, im->space); 961 im->flags.alpha, im->space);
968 if (!im_dirty) goto on_error; 962 if (!im_dirty) goto on_error;
969 if (cache->func.debug) cache->func.debug("dirty-src", im); 963 if (cache->func.debug) cache->func.debug("dirty-src", im);
970 error = cache->func.dirty(im_dirty, im); 964 cache->func.dirty(im_dirty, im);
971 if (cache->func.debug) cache->func.debug("dirty-out", im_dirty); 965 if (cache->func.debug) cache->func.debug("dirty-out", im_dirty);
972#ifdef EVAS_FRAME_QUEUING 966#ifdef EVAS_FRAME_QUEUING
973 LKL(im_dirty->lock_references); 967 LKL(im_dirty->lock_references);
@@ -1014,15 +1008,13 @@ evas_cache_image_alone(Image_Entry *im)
1014 } 1008 }
1015 else 1009 else
1016 { 1010 {
1017 int error;
1018
1019 im_dirty = evas_cache_image_copied_data(cache, im->w, im->h, 1011 im_dirty = evas_cache_image_copied_data(cache, im->w, im->h,
1020 evas_cache_image_pixels(im), 1012 evas_cache_image_pixels(im),
1021 im->flags.alpha, 1013 im->flags.alpha,
1022 im->space); 1014 im->space);
1023 if (!im_dirty) goto on_error; 1015 if (!im_dirty) goto on_error;
1024 if (cache->func.debug) cache->func.debug("dirty-src", im); 1016 if (cache->func.debug) cache->func.debug("dirty-src", im);
1025 error = cache->func.dirty(im_dirty, im); 1017 cache->func.dirty(im_dirty, im);
1026 if (cache->func.debug) cache->func.debug("dirty-out", im_dirty); 1018 if (cache->func.debug) cache->func.debug("dirty-out", im_dirty);
1027#ifdef EVAS_FRAME_QUEUING 1019#ifdef EVAS_FRAME_QUEUING
1028 LKL(im_dirty->lock_references); 1020 LKL(im_dirty->lock_references);
@@ -1296,6 +1288,7 @@ evas_cache_image_preload_cancel(Image_Entry *im, const void *target)
1296 _evas_cache_image_entry_preload_remove(im, target); 1288 _evas_cache_image_entry_preload_remove(im, target);
1297#else 1289#else
1298 (void)im; 1290 (void)im;
1291 (void)target;
1299#endif 1292#endif
1300} 1293}
1301 1294
diff --git a/libraries/evas/src/lib/cache/evas_preload.c b/libraries/evas/src/lib/cache/evas_preload.c
index 6e0412a..5eebaed 100644
--- a/libraries/evas/src/lib/cache/evas_preload.c
+++ b/libraries/evas/src/lib/cache/evas_preload.c
@@ -225,6 +225,7 @@ evas_preload_thread_run(void (*func_heavy) (void *data),
225 If no thread and as we don't want to break app that rely on this 225 If no thread and as we don't want to break app that rely on this
226 facility, we will lock the interface until we are done. 226 facility, we will lock the interface until we are done.
227 */ 227 */
228 (void)func_cancel;
228 func_heavy((void *)data); 229 func_heavy((void *)data);
229 func_end((void *)data); 230 func_end((void *)data);
230 return (void *)1; 231 return (void *)1;
@@ -253,12 +254,13 @@ evas_preload_thread_cancel(Evas_Preload_Pthread *thread)
253 } 254 }
254 } 255 }
255 LKU(_mutex); 256 LKU(_mutex);
256 257
257 /* Delay the destruction */ 258 /* Delay the destruction */
258 work = (Evas_Preload_Pthread_Worker *)thread; 259 work = (Evas_Preload_Pthread_Worker *)thread;
259 work->cancel = EINA_TRUE; 260 work->cancel = EINA_TRUE;
260 return EINA_FALSE; 261 return EINA_FALSE;
261#else 262#else
263 (void) thread;
262 return EINA_TRUE; 264 return EINA_TRUE;
263#endif 265#endif
264} 266}