Revert "(Metal raster font) remove video_frame_info dep"

This reverts commit f2df63e24682e286c09c0ca0a3e8d7de4837785a.
This commit is contained in:
Twinaphex 2020-03-10 02:07:10 +01:00
parent f2df63e246
commit dde5f67962
2 changed files with 5 additions and 7 deletions

View File

@ -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

View File

@ -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];
}