summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-01-27 11:00:02 -0500
committerChris Michael <cp.michael@samsung.com>2015-01-27 11:04:51 -0500
commitadc9cbce26b4513fc1a462b9533436641bc10fb2 (patch)
tree4bdd9cdd8f48b753d2e757b1a8e74f8fb436a39f /src/modules
parent3b695937617ffa63ed232c8b696e3e57119af1be (diff)
evas-software: Fix compile errors when using xcb
Summary: This fixes compile issues when building evas software engine using xcb. When calling xcb_outbuf_free, the Render_Engine has no 'ob' field, so remove that call. Also fix call to render_engine_software_generic_init using the proper function parameters. @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index c838f6d060..43601ef07a 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -262,7 +262,7 @@ _output_xcb_setup(int w, int h, int rot, xcb_connection_t *conn,
262 262
263 evas_software_xcb_outbuf_debug_set(ob, debug); 263 evas_software_xcb_outbuf_debug_set(ob, debug);
264 264
265 if (!evas_render_engine_software_generic_init(re, ob, NULL, 265 if (!evas_render_engine_software_generic_init(&re->generic, ob, NULL,
266 evas_software_xcb_outbuf_rotation_get, 266 evas_software_xcb_outbuf_rotation_get,
267 evas_software_xcb_outbuf_reconfigure, 267 evas_software_xcb_outbuf_reconfigure,
268 NULL, 268 NULL,
@@ -550,7 +550,6 @@ eng_setup(Evas *eo_e, void *in)
550#ifdef BUILD_ENGINE_SOFTWARE_XCB 550#ifdef BUILD_ENGINE_SOFTWARE_XCB
551 if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB) 551 if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB)
552 { 552 {
553 evas_software_xcb_outbuf_free(re->ob);
554 ob = 553 ob =
555 evas_software_xcb_outbuf_setup(e->output.w, e->output.h, 554 evas_software_xcb_outbuf_setup(e->output.w, e->output.h,
556 info->info.rotation, 555 info->info.rotation,
@@ -566,7 +565,7 @@ eng_setup(Evas *eo_e, void *in)
566 info->info.mask, 565 info->info.mask,
567 info->info.shape_dither, 566 info->info.shape_dither,
568 info->info.destination_alpha); 567 info->info.destination_alpha);
569 evas_software_xcb_outbuf_debug_set(re->ob, info->info.debug); 568 evas_software_xcb_outbuf_debug_set(ob, info->info.debug);
570 } 569 }
571#endif 570#endif
572 571