From 0782c3c82086e1f2a8eed64ed1d5623f18510e24 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 11 Oct 2018 03:26:39 +0200 Subject: [PATCH] Cleanups --- gfx/drivers/metal.m | 38 ++++++++++++++++++++++++-------------- retroarch.c | 3 +-- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m index 0fcd932d01..3496d035bf 100644 --- a/gfx/drivers/metal.m +++ b/gfx/drivers/metal.m @@ -1,9 +1,17 @@ -// -// metal.m -// RetroArch_Metal -// -// Created by Stuart Carnie on 5/14/18. -// +/* RetroArch - A frontend for libretro. + * Copyright (C) 2018 - Stuart Carnie + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * 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 . + */ #import #import @@ -28,9 +36,7 @@ #endif #ifdef HAVE_MENU - #import "../../menu/menu_driver.h" - #endif #import "../font_driver.h" @@ -145,10 +151,12 @@ static void metal_free(void *data) static void metal_set_viewport(void *data, unsigned viewport_width, unsigned viewport_height, bool force_full, bool allow_rotate) { -// RARCH_LOG("[Metal]: set_viewport size: %dx%d full: %s rotate: %s\n", -// viewport_width, viewport_height, -// force_full ? "YES" : "NO", -// allow_rotate ? "YES" : "NO"); +#if 0 + RARCH_LOG("[Metal]: set_viewport size: %dx%d full: %s rotate: %s\n", + viewport_width, viewport_height, + force_full ? "YES" : "NO", + allow_rotate ? "YES" : "NO"); +#endif } 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; 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, @@ -398,7 +408,7 @@ static const video_overlay_interface_t metal_overlay_interface = { }; static void metal_get_overlay_interface(void *data, - const video_overlay_interface_t **iface) + const video_overlay_interface_t **iface) { (void)data; *iface = &metal_overlay_interface; diff --git a/retroarch.c b/retroarch.c index ccfe66dc9f..4a286e30e7 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2060,8 +2060,7 @@ char* retroarch_get_shader_preset(void) return runtime_shader_preset; else if (!string_is_empty(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)