mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Metal raster font) remove video_frame_info dep"

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers/metal.m
View File

@ -89,10 +89,9 @@ static void *metal_init(
} }
static bool metal_frame(void *data, const void *frame, static bool metal_frame(void *data, const void *frame,
unsigned frame_width, unsigned frame_height, unsigned frame_width, unsigned frame_height,
uint64_t frame_count, uint64_t frame_count,
unsigned pitch, const char *msg, unsigned pitch, const char *msg, video_frame_info_t *video_info)
video_frame_info_t *video_info)
{ {
MetalDriver *md = (__bridge MetalDriver *)data; MetalDriver *md = (__bridge MetalDriver *)data;
return [md renderFrame:frame return [md renderFrame:frame

5
gfx/drivers_font/metal_raster_font.m
View File

@ -524,9 +524,8 @@ static void metal_raster_font_render_msg(
const struct font_params *params) const struct font_params *params)
{ {
MetalRaster *r = (__bridge MetalRaster *)data; MetalRaster *r = (__bridge MetalRaster *)data;
MetalDriver *md = (__bridge MetalDriver *)r->_driver; unsigned width = video_info->width;
unsigned width = md->_viewport->full_width; unsigned height = video_info->height;
unsigned height = md->_viewport->full_height;
[r renderMessage:msg width:width height:height params:params]; [r renderMessage:msg width:width height:height params:params];
} }