mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

metal: Split menu drawing out from core drawing

Browse Source
This commit is contained in:
Tor Arne Vestbø 2019-09-02 17:02:31 +02:00
parent 7e50bedd07
commit 48d28aa734
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/common/metal_common.m
View File

@ -269,7 +269,8 @@
[_frameView updateFrame:data pitch:pitch]; [_frameView updateFrame:data pitch:pitch];
} }
[self _drawViews:video_info]; [self _drawCore:video_info];
[self _drawMenu:video_info];
if (video_info->statistics_show) if (video_info->statistics_show)
{ {
@ -357,7 +358,7 @@
[_context begin]; [_context begin];
} }
- (void)_drawViews:(video_frame_info_t *)video_info - (void)_drawCore:(video_frame_info_t *)video_info
{ {
id<MTLRenderCommandEncoder> rce = _context.rce; id<MTLRenderCommandEncoder> rce = _context.rce;
@ -380,8 +381,16 @@
[_frameView drawWithEncoder:rce]; [_frameView drawWithEncoder:rce];
} }
[rce popDebugGroup]; [rce popDebugGroup];
}
if (_menu.enabled && _menu.hasFrame) - (void)_drawMenu:(video_frame_info_t *)video_info
{
if (!_menu.enabled)
return;
id<MTLRenderCommandEncoder> rce = _context.rce;
if (_menu.hasFrame)
{ {
[rce pushDebugGroup:@"menu frame"]; [rce pushDebugGroup:@"menu frame"];
[_menu.view drawWithContext:_context]; [_menu.view drawWithContext:_context];
@ -398,10 +407,10 @@
[_menu.view drawWithEncoder:rce]; [_menu.view drawWithEncoder:rce];
[rce popDebugGroup]; [rce popDebugGroup];
} }
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
if (_menu.enabled) else
{ {
[rce pushDebugGroup:@"menu"];
MTLViewport viewport = { MTLViewport viewport = {
.originX = 0.0f, .originX = 0.0f,
.originY = 0.0f, .originY = 0.0f,
@ -411,7 +420,6 @@
.zfar = 1.0, .zfar = 1.0,
}; };
[rce setViewport:viewport]; [rce setViewport:viewport];
[rce pushDebugGroup:@"menu"];
menu_driver_frame(video_info); menu_driver_frame(video_info);
[rce popDebugGroup]; [rce popDebugGroup];
} }