mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fullscreen-shell: Fix modeset on transformed outputs 

Previously, we blindly created a mode for the output based on surface size
and completely ignoring the output transform.  This caused modesets to fail
on outputs that were transformed by 90 or 270 degrees.  We should be
swapping the width and the height in this case.

Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Tested-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Jason Ekstrand 2015-01-08 08:57:44 -08:00 committed by Bryce Harrington
parent 87c862a9d9
commit 58106d78bb
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fullscreen-shell/fullscreen-shell.c
View File

@ -467,9 +467,28 @@ fs_output_configure_for_mode(struct fs_output *fsout,
&surf_x, &surf_y,
&surf_width, &surf_height);
/* The actual output mode is in physical units. We need to
* transform the surface size to physical unit size by flipping ans
* possibly scaling it.
*/
switch (fsout->output->transform) {
case WL_OUTPUT_TRANSFORM_90:
case WL_OUTPUT_TRANSFORM_FLIPPED_90:
case WL_OUTPUT_TRANSFORM_270:
case WL_OUTPUT_TRANSFORM_FLIPPED_270:
mode.width = surf_height * fsout->output->native_scale;
mode.height = surf_width * fsout->output->native_scale;
break;
case WL_OUTPUT_TRANSFORM_NORMAL:
case WL_OUTPUT_TRANSFORM_FLIPPED:
case WL_OUTPUT_TRANSFORM_180:
case WL_OUTPUT_TRANSFORM_FLIPPED_180:
default:
mode.width = surf_width * fsout->output->native_scale;
mode.height = surf_height * fsout->output->native_scale;
}
mode.flags = 0;
mode.width = surf_width * fsout->output->native_scale;
mode.height = surf_height * fsout->output->native_scale;
mode.refresh = fsout->pending.framerate;
ret = weston_output_mode_switch_to_temporary(fsout->output, &mode,