summaryrefslogtreecommitdiff
path: root/legacy/evas
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-09-28 06:19:35 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-09-28 06:19:35 +0000
commit70d4e06072805b5c4491605e55254c0b8bfbe819 (patch)
tree01b875720d5b1e6d90229e6e8126e5e0d1973fc8 /legacy/evas
parent0d75dc3a64e142664d20cbd41c5b7a5fa7134295 (diff)
make notes.
SVN revision: 77178
Diffstat (limited to 'legacy/evas')
-rw-r--r--legacy/evas/src/modules/engines/software_x11/evas_engine.c59
1 files changed, 36 insertions, 23 deletions
diff --git a/legacy/evas/src/modules/engines/software_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
index 090d4ad988..f3d7b241b4 100644
--- a/legacy/evas/src/modules/engines/software_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
@@ -416,29 +416,41 @@ eng_setup(Evas *e, void *in)
416 info->info.alloc_colors_max, 416 info->info.alloc_colors_max,
417 info->info.mask, info->info.shape_dither, 417 info->info.mask, info->info.shape_dither,
418 info->info.destination_alpha); 418 info->info.destination_alpha);
419 if (!re) 419 if (re)
420 re = _output_xlib_setup(e->output.w, e->output.h, 420 {
421 info->info.rotation, info->info.connection, 421 // XXX these need to provide egl functions not xlib
422 info->info.drawable, info->info.visual, 422 re->outbuf_free = evas_software_xlib_outbuf_free;
423 info->info.colormap, 423 re->outbuf_reconfigure = evas_software_xlib_outbuf_reconfigure;
424 info->info.depth, info->info.debug, 424 re->outbuf_get_rot = evas_software_xlib_outbuf_get_rot;
425 info->info.alloc_grayscale, 425 re->outbuf_new_region_for_update = evas_software_xlib_outbuf_new_region_for_update;
426 info->info.alloc_colors_max, 426 re->outbuf_push_updated_region = evas_software_xlib_outbuf_push_updated_region;
427 info->info.mask, info->info.shape_dither, 427 re->outbuf_free_region_for_update = evas_software_xlib_outbuf_free_region_for_update;
428 info->info.destination_alpha); 428 re->outbuf_flush = evas_software_xlib_outbuf_flush;
429 429 re->outbuf_idle_flush = evas_software_xlib_outbuf_idle_flush;
430 re->outbuf_free = evas_software_xlib_outbuf_free; 430 re->outbuf_alpha_get = evas_software_xlib_outbuf_alpha_get;
431 re->outbuf_reconfigure = evas_software_xlib_outbuf_reconfigure; 431 }
432 re->outbuf_get_rot = evas_software_xlib_outbuf_get_rot; 432 else
433 re->outbuf_new_region_for_update = 433 {
434 evas_software_xlib_outbuf_new_region_for_update; 434 re = _output_xlib_setup(e->output.w, e->output.h,
435 re->outbuf_push_updated_region = 435 info->info.rotation, info->info.connection,
436 evas_software_xlib_outbuf_push_updated_region; 436 info->info.drawable, info->info.visual,
437 re->outbuf_free_region_for_update = 437 info->info.colormap,
438 evas_software_xlib_outbuf_free_region_for_update; 438 info->info.depth, info->info.debug,
439 re->outbuf_flush = evas_software_xlib_outbuf_flush; 439 info->info.alloc_grayscale,
440 re->outbuf_idle_flush = evas_software_xlib_outbuf_idle_flush; 440 info->info.alloc_colors_max,
441 re->outbuf_alpha_get = evas_software_xlib_outbuf_alpha_get; 441 info->info.mask, info->info.shape_dither,
442 info->info.destination_alpha);
443
444 re->outbuf_free = evas_software_xlib_outbuf_free;
445 re->outbuf_reconfigure = evas_software_xlib_outbuf_reconfigure;
446 re->outbuf_get_rot = evas_software_xlib_outbuf_get_rot;
447 re->outbuf_new_region_for_update = evas_software_xlib_outbuf_new_region_for_update;
448 re->outbuf_push_updated_region = evas_software_xlib_outbuf_push_updated_region;
449 re->outbuf_free_region_for_update = evas_software_xlib_outbuf_free_region_for_update;
450 re->outbuf_flush = evas_software_xlib_outbuf_flush;
451 re->outbuf_idle_flush = evas_software_xlib_outbuf_idle_flush;
452 re->outbuf_alpha_get = evas_software_xlib_outbuf_alpha_get;
453 }
442 } 454 }
443#endif 455#endif
444 456
@@ -482,6 +494,7 @@ eng_setup(Evas *e, void *in)
482#ifdef BUILD_ENGINE_SOFTWARE_XLIB 494#ifdef BUILD_ENGINE_SOFTWARE_XLIB
483 if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB) 495 if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
484 { 496 {
497 // XXXX do egl stuff as above
485 evas_software_xlib_outbuf_free(re->ob); 498 evas_software_xlib_outbuf_free(re->ob);
486 re->ob = 499 re->ob =
487 evas_software_xlib_outbuf_setup_x(e->output.w, e->output.h, 500 evas_software_xlib_outbuf_setup_x(e->output.w, e->output.h,