ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2018-10-11 03:26:39 +02:00
parent 77f508dccb
commit 0782c3c820
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gfx/drivers/metal.m
View File

@ -1,9 +1,17 @@
// /* RetroArch - A frontend for libretro.
// metal.m * Copyright (C) 2018 - Stuart Carnie
// RetroArch_Metal *
// * RetroArch is free software: you can redistribute it and/or modify it under the terms
// Created by Stuart Carnie on 5/14/18. * of the GNU General Public License as published by the Free Software Found-
// * ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#import <Metal/Metal.h> #import <Metal/Metal.h>
#import <MetalKit/MetalKit.h> #import <MetalKit/MetalKit.h>
@ -28,9 +36,7 @@
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
#import "../../menu/menu_driver.h" #import "../../menu/menu_driver.h"
#endif #endif
#import "../font_driver.h" #import "../font_driver.h"
@ -145,10 +151,12 @@ static void metal_free(void *data)
static void metal_set_viewport(void *data, unsigned viewport_width, static void metal_set_viewport(void *data, unsigned viewport_width,
unsigned viewport_height, bool force_full, bool allow_rotate) unsigned viewport_height, bool force_full, bool allow_rotate)
{ {
// RARCH_LOG("[Metal]: set_viewport size: %dx%d full: %s rotate: %s\n", #if 0
// viewport_width, viewport_height, RARCH_LOG("[Metal]: set_viewport size: %dx%d full: %s rotate: %s\n",
// force_full ? "YES" : "NO", viewport_width, viewport_height,
// allow_rotate ? "YES" : "NO"); force_full ? "YES" : "NO",
allow_rotate ? "YES" : "NO");
#endif
} }
static void metal_set_rotation(void *data, unsigned rotation) static void metal_set_rotation(void *data, unsigned rotation)
@ -270,7 +278,9 @@ static void metal_set_texture_enable(void *data, bool state, bool full_screen)
return; return;
md.menu.enabled = state; md.menu.enabled = state;
//md.menu.fullScreen = full_screen; #if 0
md.menu.fullScreen = full_screen;
#endif
} }
static void metal_set_osd_msg(void *data, static void metal_set_osd_msg(void *data,
@ -398,7 +408,7 @@ static const video_overlay_interface_t metal_overlay_interface = {
}; };
static void metal_get_overlay_interface(void *data, static void metal_get_overlay_interface(void *data,
const video_overlay_interface_t **iface) const video_overlay_interface_t **iface)
{ {
(void)data; (void)data;
*iface = &metal_overlay_interface; *iface = &metal_overlay_interface;

3
retroarch.c
View File

@ -2060,8 +2060,7 @@ char* retroarch_get_shader_preset(void)
return runtime_shader_preset; return runtime_shader_preset;
else if (!string_is_empty(settings->paths.path_shader)) else if (!string_is_empty(settings->paths.path_shader))
return settings->paths.path_shader; return settings->paths.path_shader;
else return NULL;
return NULL;
} }
bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data) bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data)