diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2015-01-08 08:57:44 -0800 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-08-07 12:23:17 -0700 |
| commit | 58106d78bb75201aea8d0226407dc6ddaf304188 (patch) | |
| tree | fe34e7141e8e1c5bd061b9b6fd2762a5f22f7a3d /fullscreen-shell | |
| parent | 87c862a9d9e83b00931375ba076375c0504d5b6c (diff) | |
| download | weston-58106d78bb75201aea8d0226407dc6ddaf304188.tar.gz | |
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>
Diffstat (limited to 'fullscreen-shell')
| -rw-r--r-- | fullscreen-shell/fullscreen-shell.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c index fa0bf8c7..77487244 100644 --- a/fullscreen-shell/fullscreen-shell.c +++ b/fullscreen-shell/fullscreen-shell.c @@ -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, |