From dde5f67962b3a308229216b94047a38b0be54046 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 10 Mar 2020 02:07:10 +0100 Subject: [PATCH] Revert "(Metal raster font) remove video_frame_info dep" This reverts commit f2df63e24682e286c09c0ca0a3e8d7de4837785a. --- gfx/drivers/metal.m | 7 +++---- gfx/drivers_font/metal_raster_font.m | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m index 65bac939d5..da2472d4e6 100644 --- a/gfx/drivers/metal.m +++ b/gfx/drivers/metal.m @@ -89,10 +89,9 @@ static void *metal_init( } static bool metal_frame(void *data, const void *frame, - unsigned frame_width, unsigned frame_height, - uint64_t frame_count, - unsigned pitch, const char *msg, - video_frame_info_t *video_info) + unsigned frame_width, unsigned frame_height, + uint64_t frame_count, + unsigned pitch, const char *msg, video_frame_info_t *video_info) { MetalDriver *md = (__bridge MetalDriver *)data; return [md renderFrame:frame diff --git a/gfx/drivers_font/metal_raster_font.m b/gfx/drivers_font/metal_raster_font.m index a5331f31a4..435f6981a0 100644 --- a/gfx/drivers_font/metal_raster_font.m +++ b/gfx/drivers_font/metal_raster_font.m @@ -524,9 +524,8 @@ static void metal_raster_font_render_msg( const struct font_params *params) { MetalRaster *r = (__bridge MetalRaster *)data; - MetalDriver *md = (__bridge MetalDriver *)r->_driver; - unsigned width = md->_viewport->full_width; - unsigned height = md->_viewport->full_height; + unsigned width = video_info->width; + unsigned height = video_info->height; [r renderMessage:msg width:width height:height params:params]; }