mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6418 from bearoso/master

Browse Source 
Fix multi-line text spacing in menus with Vulkan driver.
This commit is contained in:
Twinaphex 2018-03-19 03:46:35 +01:00 committed by GitHub
commit a357198bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/drivers_context/x_ctx.c
View File

@ -455,6 +455,7 @@ static bool gfx_ctx_x_set_resize(void *data,
if (!vulkan_create_swapchain(&x->vk, width, height, x->g_interval)) if (!vulkan_create_swapchain(&x->vk, width, height, x->g_interval))
{ {
RARCH_ERR("[X/Vulkan]: Failed to update swapchain.\n"); RARCH_ERR("[X/Vulkan]: Failed to update swapchain.\n");
x->vk.swapchain = VK_NULL_HANDLE;
return false; return false;
} }
@ -469,7 +470,7 @@ static bool gfx_ctx_x_set_resize(void *data,
default: default:
break; break;
} }
return false; return true;
} }
static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data) static void *gfx_ctx_x_init(video_frame_info_t *video_info, void *data)

3
gfx/drivers_font/vulkan_raster_font.c
View File

@ -240,7 +240,8 @@ static void vulkan_raster_font_render_message(
return; return;
} }
line_height = scale / font->font_driver->get_line_height(font->font_data); line_height = (float) font->font_driver->get_line_height(font->font_data) *
scale / font->vk->vp.height;
for (;;) for (;;)
{ {