summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines
diff options
context:
space:
mode:
authorChris Micheal <cp.michael@samsung.com>2018-08-30 13:32:51 +0900
committerHermet Park <hermetpark@gmail.com>2018-08-30 13:34:57 +0900
commite800139953d1f2995a1f0c41301a166cfe232f63 (patch)
treee144104e45198c902a0229df80cdbb8055bb64f3 /src/modules/evas/engines
parent54f2a554dab13890ee9daf7b332442c79f58c6a0 (diff)
evas-gl-generic: Remove cserve2 support
ref T7226 Depends on D6925
Diffstat (limited to 'src/modules/evas/engines')
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c41
1 files changed, 5 insertions, 36 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index ec29b19cdc..28be4be74b 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -17,10 +17,6 @@
17 17
18#include "Evas_Engine_GL_Generic.h" 18#include "Evas_Engine_GL_Generic.h"
19 19
20#ifdef EVAS_CSERVE2
21#include "evas_cs2_private.h"
22#endif
23
24#define EVAS_GL_NO_GL_H_CHECK 1 20#define EVAS_GL_NO_GL_H_CHECK 1
25#include "Evas_GL.h" 21#include "Evas_GL.h"
26 22
@@ -275,14 +271,7 @@ eng_image_alpha_set(void *engine, void *image, int has_alpha)
275 Evas_GL_Image *im_new; 271 Evas_GL_Image *im_new;
276 272
277 if (!im->im->image.data) 273 if (!im->im->image.data)
278 { 274 evas_cache_image_load_data(&im->im->cache_entry);
279#ifdef EVAS_CSERVE2
280 if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->im->cache_entry))
281 evas_cache2_image_load_data(&im->im->cache_entry);
282 else
283#endif
284 evas_cache_image_load_data(&im->im->cache_entry);
285 }
286 evas_gl_common_image_alloc_ensure(im); 275 evas_gl_common_image_alloc_ensure(im);
287 im_new = evas_gl_common_image_new_from_copied_data 276 im_new = evas_gl_common_image_new_from_copied_data
288 (im->gc, im->im->cache_entry.w, im->im->cache_entry.h, 277 (im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
@@ -902,12 +891,7 @@ eng_image_data_get(void *engine, void *image, int to_write, DATA32 **image_data,
902 } 891 }
903 } 892 }
904 893
905#ifdef EVAS_CSERVE2 894 error = evas_cache_image_load_data(&im->im->cache_entry);
906 if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->im->cache_entry))
907 error = evas_cache2_image_load_data(&im->im->cache_entry);
908 else
909#endif
910 error = evas_cache_image_load_data(&im->im->cache_entry);
911 895
912 if (err) *err = error; 896 if (err) *err = error;
913 if (error != EVAS_LOAD_ERROR_NONE) 897 if (error != EVAS_LOAD_ERROR_NONE)
@@ -1132,12 +1116,7 @@ eng_image_data_preload_request(void *engine EINA_UNUSED, void *image, const Eo *
1132 im = (RGBA_Image *)gim->im; 1116 im = (RGBA_Image *)gim->im;
1133 if (!im) return; 1117 if (!im) return;
1134 1118
1135#ifdef EVAS_CSERVE2 1119 evas_cache_image_preload_data(&im->cache_entry, target, evas_gl_common_image_preload_done, gim);
1136 if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->cache_entry))
1137 evas_cache2_image_preload_data(&im->cache_entry, target, evas_gl_common_image_preload_done, gim);
1138 else
1139#endif
1140 evas_cache_image_preload_data(&im->cache_entry, target, evas_gl_common_image_preload_done, gim);
1141} 1120}
1142 1121
1143static void 1122static void
@@ -1152,12 +1131,7 @@ eng_image_data_preload_cancel(void *engine EINA_UNUSED, void *image, const Eo *t
1152 if (!im) return; 1131 if (!im) return;
1153 1132
1154 evas_gl_common_image_preload_unwatch(gim); 1133 evas_gl_common_image_preload_unwatch(gim);
1155#ifdef EVAS_CSERVE2 1134 evas_cache_image_preload_cancel(&im->cache_entry, target);
1156 if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->cache_entry))
1157 evas_cache2_image_preload_cancel(&im->cache_entry, target);
1158 else
1159#endif
1160 evas_cache_image_preload_cancel(&im->cache_entry, target);
1161// if (gim->tex) evas_gl_preload_target_unregister(gim->tex, (Eo*) target); 1135// if (gim->tex) evas_gl_preload_target_unregister(gim->tex, (Eo*) target);
1162} 1136}
1163 1137
@@ -2182,12 +2156,7 @@ eng_pixel_alpha_get(void *image, int x, int y, DATA8 *alpha, int src_region_x, i
2182 { 2156 {
2183 DATA32 *pixel; 2157 DATA32 *pixel;
2184 2158
2185#ifdef EVAS_CSERVE2 2159 evas_cache_image_load_data(&im->im->cache_entry);
2186 if (evas_cserve2_use_get() && evas_cache2_image_cached(&im->im->cache_entry))
2187 evas_cache2_image_load_data(&im->im->cache_entry);
2188 else
2189#endif
2190 evas_cache_image_load_data(&im->im->cache_entry);
2191 if (!im->im->cache_entry.flags.loaded) 2160 if (!im->im->cache_entry.flags.loaded)
2192 { 2161 {
2193 ERR("im %p has no pixels loaded yet", im); 2162 ERR("im %p has no pixels loaded yet", im);