godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32818 from bruvzg/vlk_fix_hidpi_and_resize

Browse Source 
[Vulkan, macOS] Improve HiDPI handling, fix incorrect window viewport clipping.
This commit is contained in:
Rémi Verschelde 2019-10-15 08:28:44 +02:00 committed by GitHub
commit 815f09ef76
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/vulkan/rendering_device_vulkan.cpp
View File

@ -5277,7 +5277,7 @@ RenderingDevice::DrawListID RenderingDeviceVulkan::draw_list_begin_for_screen(in
scissor.offset.x = 0;
scissor.offset.y = 0;
scissor.extent.width = size_x;
scissor.extent.height = size_x;
scissor.extent.height = size_y;
vkCmdSetScissor(command_buffer, 0, 1, &scissor);

6
platform/osx/os_osx.mm
View File

@ -331,6 +331,12 @@ static Vector2 get_mouse_pos(NSPoint locationInWindow, CGFloat backingScaleFacto
OS_OSX::singleton->window_size.width = fbRect.size.width * newDisplayScale;
OS_OSX::singleton->window_size.height = fbRect.size.height * newDisplayScale;
#if defined(VULKAN_ENABLED)
if (OS_OSX::singleton->video_driver_index == OS::VIDEO_DRIVER_VULKAN) {
CALayer* layer = [OS_OSX::singleton->window_view layer];
layer.contentsScale = OS_OSX::singleton->_display_scale();
}
#endif
//Update context
if (OS_OSX::singleton->main_loop) {
//Force window resize event