From 7f89c3a4e88a1699a04519780bf9e406166726e1 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 9 Aug 2017 10:49:24 -0500 Subject: [PATCH] Remove ecore_drm support ecore_drm2 supersedes this, ecore_drm is deprecated, and we depend on an efl version newer than the deprecation, so none of this code should ever be built. --- src/bin/e_alert_main.c | 154 ----------------------------------------- 1 file changed, 154 deletions(-) diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c index a2762c1cb..694142a4f 100644 --- a/src/bin/e_alert_main.c +++ b/src/bin/e_alert_main.c @@ -376,7 +376,6 @@ _e_alert_drm_run(void) ecore_main_loop_begin(); } -# ifdef HAVE_DRM2 static Ecore_Drm2_Device *dev = NULL; static Ecore_Drm2_Fb *buffer = NULL; static Ecore_Drm2_Output *output = NULL; @@ -524,159 +523,6 @@ _e_alert_drm_shutdown(void) evas_shutdown(); } -# else -static Ecore_Drm_Device *dev = NULL; -static Ecore_Drm_Fb *buffer; - -static int -_e_alert_drm_connect(void) -{ - fprintf(stderr, "E_Alert Drm Connect\n"); - - if (!evas_init()) - { - printf("\tCannot init evas\n"); - return 0; - } - - if (!ecore_drm_init()) - { - printf("\tCannot init ecore_drm\n"); - return 0; - } - - dev = ecore_drm_device_find(NULL, NULL); - if (!dev) - { - printf("\tCannot find drm device\n"); - return 0; - } - - if (!ecore_drm_launcher_connect(dev)) - { - printf("\tCannot connect to drm device\n"); - return 0; - } - - if (!ecore_drm_device_open(dev)) - { - printf("\tCannot open drm device\n"); - return 0; - } - - if (!ecore_drm_outputs_create(dev)) - { - printf("\tCannot create drm outputs\n"); - return 0; - } - - if (!ecore_drm_inputs_create(dev)) - { - printf("\tCannot create drm inputs\n"); - return 0; - } - - ecore_drm_outputs_geometry_get(dev, NULL, NULL, &sw, &sh); - fprintf(stderr, "\tOutput Size: %d %d\n", sw, sh); - - ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, - _e_alert_drm_cb_key_down, NULL); - - return 1; -} - -static void -_e_alert_drm_create(void) -{ - int method = 0; - - fprintf(stderr, "E_Alert Drm Create\n"); - - fh = 13; - - if (!ecore_drm_device_software_setup(dev)) - { - printf("\tFailed to setup software mode\n"); - return; - } - - buffer = ecore_drm_fb_create(dev, sw, sh); - memset(buffer->mmap, 0, buffer->size); - - method = evas_render_method_lookup("buffer"); - if (method <= 0) - { - fprintf(stderr, "\tCould not get evas render method\n"); - return; - } - - canvas = evas_new(); - if (!canvas) - { - fprintf(stderr, "\tFailed to create new canvas\n"); - return; - } - - evas_output_method_set(canvas, method); - evas_output_size_set(canvas, sw, sh); - evas_output_viewport_set(canvas, 0, 0, sw, sh); - - Evas_Engine_Info_Buffer *einfo; - einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(canvas); - if (!einfo) - { - printf("\tFailed to get evas engine info\n"); - evas_free(canvas); - return; - } - - einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_ARGB32; - einfo->info.dest_buffer = buffer->mmap; - einfo->info.dest_buffer_row_bytes = (sw * sizeof(int)); - einfo->info.use_color_key = 0; - einfo->info.alpha_threshold = 0; - einfo->info.func.new_update_region = NULL; - einfo->info.func.free_update_region = NULL; - evas_engine_info_set(canvas, (Evas_Engine_Info *)einfo); - - _e_alert_drm_draw_outline(); - _e_alert_drm_draw_title_outline(); - _e_alert_drm_draw_title(); - _e_alert_drm_draw_text(); - _e_alert_drm_draw_button_outlines(); -} - -static void -_e_alert_drm_display(void) -{ - Eina_List *updates; - - printf("E_Alert Drm Display\n"); - - updates = evas_render_updates(canvas); - evas_render_updates_free(updates); - - ecore_drm_fb_send(dev, buffer, NULL, NULL); -} - -static void -_e_alert_drm_shutdown(void) -{ - printf("E_Alert Drm Shutdown\n"); - - evas_free(canvas); - - if (dev) - { - ecore_drm_device_close(dev); - ecore_drm_launcher_disconnect(dev); - ecore_drm_device_free(dev); - } - - ecore_drm_shutdown(); - evas_shutdown(); -} -# endif #endif int