devilhorns pushed a commit to branch feature/wayland/multi-output. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a8d73f0a268ec585d3b71633d91d068c1681c13a
commit a8d73f0a268ec585d3b71633d91d068c1681c13a Author: Chris Michael <[email protected]> Date: Fri Dec 15 12:06:54 2017 -0500 wl-drm: remove old randr apply code Signed-off-by: Chris Michael <[email protected]> --- src/modules/wl_drm/e_mod_main.c | 96 ----------------------------------------- 1 file changed, 96 deletions(-) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index 1fc237ed0..80285660d 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -526,103 +526,7 @@ _drm2_output_primary_set(const Eina_List *outputs, Ecore_Drm2_Output *output) static void _drm2_randr_apply(void) { - const Eina_List *l; - Eina_List *ll; - E_Randr2_Screen *s; - Ecore_Drm2_Device *dev; - const Eina_List *outputs; - Ecore_Drm2_Output *output; - int minw, minh, maxw, maxh; - int ow = 0, oh = 0; - int pw = 0, ph = 0; - int vw = 0, vh = 0; - int nw = 0, nh = 0; - int top_priority = 0; - dev = ecore_evas_data_get(e_comp->ee, "device"); - if (!dev) return; - - outputs = ecore_drm2_outputs_get(dev); - if (!outputs) return; - - ecore_drm2_device_screen_size_range_get(dev, &minw, &minh, &maxw, &maxh); - printf("DRM2 RRR: size range: %ix%i -> %ix%i\n", minw, minh, maxw, maxh); - - nw = e_randr2->w; - nh = e_randr2->h; - - /* get virtual size */ - EINA_LIST_FOREACH(outputs, l, output) - { - if (!ecore_drm2_output_connected_get(output)) continue; - if (!ecore_drm2_output_enabled_get(output)) continue; - if (ecore_drm2_output_cloned_get(output)) continue; - - e_drm2_output_info_get(output, NULL, NULL, &ow, &oh, NULL); - pw += MAX(pw, ow); - ph = MAX(ph, oh); - } - - if (nw > maxw) nw = maxw; - if (nh > maxh) nh = maxh; - if (nw < minw) nw = minw; - if (nh < minh) nh = minh; - vw = nw; - vh = nh; - if (nw < pw) vw = pw; - if (nh < ph) vh = ph; - - printf("DRM2 RRR: set vsize: %ix%i\n", vw, vh); - - EINA_LIST_FOREACH(e_randr2->screens, ll, s) - { - Ecore_Drm2_Output_Mode *mode = NULL; - - if (!s->config.configured) continue; - - output = _drm2_output_find(outputs, s->info.name); - if (!output) continue; - - if (s->config.enabled) - mode = _drm2_mode_screen_find(s, output); - - if (s->config.priority > top_priority) - top_priority = s->config.priority; - - ecore_drm2_output_mode_set(output, mode, s->config.geom.x, - s->config.geom.y); - - /* TODO: cannot support rotations until we support planes - * and we cannot support planes until Atomic support is in */ - int orient = 0; - - if (s->config.rotation == 0) - orient = ECORE_DRM2_ROTATION_NORMAL; - else if (s->config.rotation == 90) - orient = ECORE_DRM2_ROTATION_90; - else if (s->config.rotation == 180) - orient = ECORE_DRM2_ROTATION_180; - else if (s->config.rotation == 270) - orient = ECORE_DRM2_ROTATION_270; - - ecore_drm2_output_rotation_set(output, orient); - - if (s->config.priority == top_priority) - _drm2_output_primary_set(outputs, output); - - ecore_drm2_output_enabled_set(output, s->config.enabled); - - printf("\tDRM2 RRR: Mode\n"); - printf("\t\tDRM2 RRR: Geom: %d %d %dx%d\n", - s->config.geom.x, s->config.geom.y, - s->config.mode.w, s->config.mode.h); - printf("\t\tDRM2 RRR: Refresh: %f\n", s->config.mode.refresh); - printf("\t\tDRM2 RRR: Preferred: %d\n", s->config.mode.preferred); - printf("\tDRM2 RRR: Rotation: %d\n", s->config.rotation); - printf("\tDRM2 RRR: Relative Mode: %d\n", s->config.relative.mode); - printf("\tDRM2 RRR: Relative To: %s\n", s->config.relative.to); - printf("\tDRM2 RRR: Align: %f\n", s->config.relative.align); - } } static void --
