diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/modules/engines/wayland_shm/evas_engine.c | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/evas/src/modules/engines/wayland_shm/evas_engine.c')
-rw-r--r-- | libraries/evas/src/modules/engines/wayland_shm/evas_engine.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c index 7c55517..17b17bf 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c +++ b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c | |||
@@ -28,7 +28,7 @@ static Evas_Func func, pfunc; | |||
28 | int _evas_engine_way_shm_log_dom = -1; | 28 | int _evas_engine_way_shm_log_dom = -1; |
29 | 29 | ||
30 | /* local function prototypes */ | 30 | /* local function prototypes */ |
31 | static void *_output_setup(int w, int h, int rotation, void *dest); | 31 | static void *_output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest); |
32 | 32 | ||
33 | /* engine function prototypes */ | 33 | /* engine function prototypes */ |
34 | static void *eng_info(Evas *evas __UNUSED__); | 34 | static void *eng_info(Evas *evas __UNUSED__); |
@@ -48,7 +48,7 @@ static Eina_Bool eng_canvas_alpha_get(void *data, void *context __UNUSED__); | |||
48 | 48 | ||
49 | /* local functions */ | 49 | /* local functions */ |
50 | static void * | 50 | static void * |
51 | _output_setup(int w, int h, int rotation, void *dest) | 51 | _output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest) |
52 | { | 52 | { |
53 | Render_Engine *re = NULL; | 53 | Render_Engine *re = NULL; |
54 | 54 | ||
@@ -56,7 +56,7 @@ _output_setup(int w, int h, int rotation, void *dest) | |||
56 | 56 | ||
57 | if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL; | 57 | if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL; |
58 | 58 | ||
59 | if (!(re->ob = evas_outbuf_setup(w, h, rotation, dest))) | 59 | if (!(re->ob = evas_outbuf_setup(w, h, rotation, alpha, dest))) |
60 | { | 60 | { |
61 | free(re); | 61 | free(re); |
62 | return NULL; | 62 | return NULL; |
@@ -127,7 +127,8 @@ eng_setup(Evas *evas, void *info) | |||
127 | evas_common_tilebuf_init(); | 127 | evas_common_tilebuf_init(); |
128 | 128 | ||
129 | re = _output_setup(evas->output.w, evas->output.h, | 129 | re = _output_setup(evas->output.w, evas->output.h, |
130 | in->info.rotation, in->info.dest); | 130 | in->info.rotation, in->info.destination_alpha, |
131 | in->info.dest); | ||
131 | if (!re) return 0; | 132 | if (!re) return 0; |
132 | 133 | ||
133 | re->outbuf_free = evas_outbuf_free; | 134 | re->outbuf_free = evas_outbuf_free; |
@@ -141,7 +142,8 @@ eng_setup(Evas *evas, void *info) | |||
141 | if (!(re = evas->engine.data.output)) return 0; | 142 | if (!(re = evas->engine.data.output)) return 0; |
142 | if (re->ob) re->outbuf_free(re->ob); | 143 | if (re->ob) re->outbuf_free(re->ob); |
143 | re->ob = evas_outbuf_setup(evas->output.w, evas->output.h, | 144 | re->ob = evas_outbuf_setup(evas->output.w, evas->output.h, |
144 | in->info.rotation, in->info.dest); | 145 | in->info.rotation, |
146 | in->info.destination_alpha, in->info.dest); | ||
145 | if (re->tb) evas_common_tilebuf_free(re->tb); | 147 | if (re->tb) evas_common_tilebuf_free(re->tb); |
146 | if ((re->tb = evas_common_tilebuf_new(evas->output.w, evas->output.h))) | 148 | if ((re->tb = evas_common_tilebuf_new(evas->output.w, evas->output.h))) |
147 | evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); | 149 | evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); |