diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/evas/src/lib/include/evas_common.h | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/lib/include/evas_common.h | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/libraries/evas/src/lib/include/evas_common.h b/libraries/evas/src/lib/include/evas_common.h index f817202..a9063e6 100644 --- a/libraries/evas/src/lib/include/evas_common.h +++ b/libraries/evas/src/lib/include/evas_common.h | |||
@@ -1,9 +1,9 @@ | |||
1 | #ifndef EVAS_COMMON_H | 1 | #ifndef EVAS_COMMON_H |
2 | #define EVAS_COMMON_H | 2 | #define EVAS_COMMON_H |
3 | 3 | ||
4 | #ifdef HAVE_CONFIG_H | 4 | //#ifdef HAVE_CONFIG_H |
5 | # include "config.h" /* so that EAPI in Evas.h is correctly defined */ | 5 | #include "config.h" /* so that EAPI in Evas.h is correctly defined */ |
6 | #endif | 6 | //#endif |
7 | 7 | ||
8 | #ifdef HAVE_EVIL | 8 | #ifdef HAVE_EVIL |
9 | # include <Evil.h> | 9 | # include <Evil.h> |
@@ -138,8 +138,6 @@ extern EAPI int _evas_log_dom_global; | |||
138 | # define BUILD_PTHREAD | 138 | # define BUILD_PTHREAD |
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | #ifdef BUILD_PTHREAD | ||
142 | |||
143 | #define LK(x) Eina_Lock x | 141 | #define LK(x) Eina_Lock x |
144 | #define LKI(x) eina_lock_new(&(x)) | 142 | #define LKI(x) eina_lock_new(&(x)) |
145 | #define LKD(x) eina_lock_free(&(x)) | 143 | #define LKD(x) eina_lock_free(&(x)) |
@@ -148,42 +146,28 @@ extern EAPI int _evas_log_dom_global; | |||
148 | #define LKU(x) eina_lock_release(&(x)) | 146 | #define LKU(x) eina_lock_release(&(x)) |
149 | #define LKDBG(x) eina_lock_debug(&(x)) | 147 | #define LKDBG(x) eina_lock_debug(&(x)) |
150 | 148 | ||
149 | /* for rwlocks */ | ||
150 | #define RWLK(x) Eina_RWLock x | ||
151 | #define RWLKI(x) eina_rwlock_new(&(x)) | ||
152 | #define RWLKD(x) eina_rwlock_free(&(x)) | ||
153 | #define RDLKL(x) eina_rwlock_take_read(&(x)) | ||
154 | #define WRLKL(x) eina_rwlock_take_write(&(x)) | ||
155 | #define RWLKU(x) eina_rwlock_release(&(x)) | ||
156 | |||
157 | #ifdef BUILD_PTHREAD | ||
158 | |||
151 | # define TH(x) pthread_t x | 159 | # define TH(x) pthread_t x |
152 | # define THI(x) int x | 160 | # define THI(x) int x |
153 | # define TH_MAX 8 | 161 | # define TH_MAX 8 |
154 | 162 | ||
155 | /* for rwlocks */ | ||
156 | #define RWLK(x) pthread_rwlock_t x | ||
157 | #define RWLKI(x) pthread_rwlock_init(&(x), NULL) | ||
158 | #define RWLKD(x) pthread_rwlock_destroy(&(x)) | ||
159 | #define RDLKL(x) pthread_rwlock_rdlock(&(x)) | ||
160 | #define WRLKL(x) pthread_rwlock_wrlock(&(x)) | ||
161 | #define RWLKU(x) pthread_rwlock_unlock(&(x)) | ||
162 | |||
163 | |||
164 | // even though in theory having every Nth rendered line done by a different | 163 | // even though in theory having every Nth rendered line done by a different |
165 | // thread might even out load across threads - it actually slows things down. | 164 | // thread might even out load across threads - it actually slows things down. |
166 | //#define EVAS_SLI 1 | 165 | //#define EVAS_SLI 1 |
167 | 166 | ||
168 | #else | 167 | #else |
169 | # define LK(x) | ||
170 | # define LKI(x) | ||
171 | # define LKD(x) | ||
172 | # define LKL(x) | ||
173 | # define LKT(x) 1 | ||
174 | # define LKU(x) | ||
175 | # define TH(x) | 168 | # define TH(x) |
176 | # define THI(x) | 169 | # define THI(x) |
177 | # define TH_MAX 0 | 170 | # define TH_MAX 0 |
178 | # define LKDBG(x) | ||
179 | |||
180 | /* for rwlocks */ | ||
181 | #define RWLK(x) | ||
182 | #define RWLKI(x) | ||
183 | #define RWLKD(x) | ||
184 | #define RDLKL(x) | ||
185 | #define WRLKL(x) | ||
186 | #define RWLKU(x) | ||
187 | 171 | ||
188 | #endif | 172 | #endif |
189 | 173 | ||
@@ -338,6 +322,21 @@ void *alloca (size_t); | |||
338 | #define pld(addr, off) | 322 | #define pld(addr, off) |
339 | #endif /* __ARMEL__ */ | 323 | #endif /* __ARMEL__ */ |
340 | 324 | ||
325 | // these here are in config.h - just here for documentation | ||
326 | //#ifdef __ARM_ARCH__ | ||
327 | // *IF* you enable pixman, this determines which things pixman will do | ||
328 | ////#define PIXMAN_FONT 1 | ||
329 | ////#define PIXMAN_RECT 1 | ||
330 | ////#define PIXMAN_LINE 1 | ||
331 | ////#define PIXMAN_POLY 1 | ||
332 | //#define PIXMAN_IMAGE 1 | ||
333 | //#define PIXMAN_IMAGE_SCALE_SAMPLE 1 | ||
334 | //#endif | ||
335 | // not related to pixman but an alternate rotate code | ||
336 | //#define TILE_ROTATE 1 | ||
337 | |||
338 | #define TILE_CACHE_LINE_SIZE 64 | ||
339 | |||
341 | /*****************************************************************************/ | 340 | /*****************************************************************************/ |
342 | 341 | ||
343 | #define UNROLL2(op...) op op | 342 | #define UNROLL2(op...) op op |
@@ -678,6 +677,9 @@ struct _RGBA_Draw_Context | |||
678 | DATA32 col; | 677 | DATA32 col; |
679 | } mul; | 678 | } mul; |
680 | struct { | 679 | struct { |
680 | #ifdef HAVE_PIXMAN | ||
681 | pixman_image_t *pixman_color_image; | ||
682 | #endif | ||
681 | DATA32 col; | 683 | DATA32 col; |
682 | } col; | 684 | } col; |
683 | struct RGBA_Draw_Context_clip { | 685 | struct RGBA_Draw_Context_clip { |
@@ -1032,14 +1034,14 @@ struct _Tilebuf | |||
1032 | int x, y, w, h; | 1034 | int x, y, w, h; |
1033 | } prev_add, prev_del; | 1035 | } prev_add, prev_del; |
1034 | #ifdef RECTUPDATE | 1036 | #ifdef RECTUPDATE |
1035 | /* | 1037 | /* |
1036 | Regionbuf *rb; | 1038 | Regionbuf *rb; |
1037 | */ | 1039 | */ |
1038 | #elif defined(EVAS_RECT_SPLIT) | 1040 | #elif defined(EVAS_RECT_SPLIT) |
1039 | int need_merge; | 1041 | int need_merge; |
1040 | list_t rects; | 1042 | list_t rects; |
1041 | #else | 1043 | #else |
1042 | /* | 1044 | /* |
1043 | struct { | 1045 | struct { |
1044 | int w, h; | 1046 | int w, h; |
1045 | Tilebuf_Tile *tiles; | 1047 | Tilebuf_Tile *tiles; |