Author: axeld Date: 2011-07-19 20:16:58 +0200 (Tue, 19 Jul 2011) New Revision: 42454 Changeset: https://dev.haiku-os.org/changeset/42454 Ticket: https://dev.haiku-os.org/ticket/7751 Modified: haiku/trunk/headers/private/graphics/common/create_display_modes.h haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp Log: * Add the width, and height to fill_display_mode(). This should help with #7751 this time. Modified: haiku/trunk/headers/private/graphics/common/create_display_modes.h =================================================================== --- haiku/trunk/headers/private/graphics/common/create_display_modes.h 2011-07-19 18:14:29 UTC (rev 42453) +++ haiku/trunk/headers/private/graphics/common/create_display_modes.h 2011-07-19 18:16:58 UTC (rev 42454) @@ -1,5 +1,5 @@ /* - * Copyright 2007-2009, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx + * Copyright 2007-2011, Axel Dörfler, axeld@xxxxxxxxxxxxxxxxx * Distributed under the terms of the MIT License. */ #ifndef _CREATE_DISPLAY_MODES_H @@ -23,7 +23,7 @@ const color_space* spaces, uint32 spacesCount, check_display_mode_hook hook, display_mode** _modes, uint32* _count); -void fill_display_mode(display_mode* mode); +void fill_display_mode(uint32 width, uint32 height, display_mode* mode); #ifdef __cplusplus } Modified: haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp =================================================================== --- haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp 2011-07-19 18:14:29 UTC (rev 42453) +++ haiku/trunk/src/add-ons/accelerants/common/create_display_modes.cpp 2011-07-19 18:16:58 UTC (rev 42454) @@ -399,7 +399,7 @@ != B_OK) return; - fill_display_mode(&mode); + fill_display_mode(width, height, &mode); _AddMode(mode); } @@ -518,11 +518,11 @@ void -fill_display_mode(display_mode* mode) +fill_display_mode(uint32 width, uint32 height, display_mode* mode) { mode->space = B_CMAP8; - mode->virtual_width = mode->timing.h_display; - mode->virtual_height = mode->timing.v_display; + mode->virtual_width = width; + mode->virtual_height = height; mode->h_display_start = 0; mode->v_display_start = 0; mode->flags = MODE_FLAGS; Modified: haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp =================================================================== --- haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp 2011-07-19 18:14:29 UTC (rev 42453) +++ haiku/trunk/src/add-ons/accelerants/vesa/mode.cpp 2011-07-19 18:16:58 UTC (rev 42454) @@ -90,7 +90,8 @@ for (uint32 i = gInfo->shared_info->vesa_mode_count; i-- > 0;) { compute_display_timing(vesaModes[i].width, vesaModes[i].height, 60, false, &initialModes[i].timing); - fill_display_mode(&initialModes[i]); + fill_display_mode(vesaModes[i].width, vesaModes[i].height, + &initialModes[i]); } } }