mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of ui_cocoa_metal.h

Browse Source
This commit is contained in:
twinaphex 2019-02-07 04:37:05 +01:00
parent ce05185cdf
commit 2599172831
6 changed files with 11 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers_context/cocoa_gl_ctx_metal.m
View File

@ -104,8 +104,9 @@ static int g_fast_forward_skips;
static bool g_is_syncing = true;
static bool g_use_hw_ctx = false;
#include "../../ui/drivers/ui_cocoa.h"
#if defined(HAVE_COCOA_METAL)
#include "../../ui/drivers/ui_cocoa_metal.h"
static NSOpenGLPixelFormat* g_format;
void *glcontext_get_ptr(void)
@ -822,8 +823,8 @@ static void cocoagl_gfx_ctx_check_window(void *data, bool *quit,
}
static void cocoagl_gfx_ctx_input_driver(void *data,
const char *name,
const input_driver_t **input, void **input_data)
const char *name,
const input_driver_t **input, void **input_data)
{
*input = NULL;
*input_data = NULL;

2
pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
View File

@ -547,7 +547,6 @@
84DD5EB71A89F1C7007336C1 /* retroarch.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = retroarch.icns; path = ../../media/retroarch.icns; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; };
A902040DE66D42F9EE47BFE3 /* MenuDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuDisplay.h; sourceTree = "<group>"; };
A90205DCA5102DF8D80D3F68 /* ui_cocoa_metal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_cocoa_metal.h; sourceTree = "<group>"; };
A90205FD4D5979BD8B7E4DD6 /* Info_Metal.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.info; name = Info_Metal.plist; path = OSX/Info_Metal.plist; sourceTree = "<group>"; };
A902065A41AEBECE594908C7 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = OSX/en.lproj/MainMenu_Metal.xib; sourceTree = "<group>"; };
A902070F2C43F222FD56A95A /* MenuDisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuDisplay.m; sourceTree = "<group>"; };
@ -944,7 +943,6 @@
05366511213F8BE5007E7EA0 /* qt */,
05A8C5CE20DB72F000FF7857 /* ui_cocoa.h */,
05A8C5BA20DB72F000FF7857 /* ui_cocoa.m */,
A90205DCA5102DF8D80D3F68 /* ui_cocoa_metal.h */,
A9020EE4BE2C6A15024A32E0 /* ui_cocoa_metal.m */,
A9020BD6594399DDAB0E2563 /* ui_cocoatouch_metal.m */,
05A8C5CF20DB72F000FF7857 /* ui_cocoatouch.m */,

4
ui/drivers/cocoa/cocoa_common_metal.m
View File

@ -17,9 +17,7 @@
#import <AvailabilityMacros.h>
#include <sys/stat.h>
#include "cocoa_common_metal.h"
#ifdef HAVE_COCOA_METAL
#include "../ui_cocoa_metal.h"
#endif
#include "../ui_cocoa.h"
#include <retro_assert.h>

2
ui/drivers/cocoa/ui_cocoa_window_metal.m
View File

@ -22,7 +22,7 @@
#include <string/stdstring.h>
#include "cocoa_common_metal.h"
#include "../ui_cocoa_metal.h"
#include "../ui_cocoa.h"
#include "../../ui_companion_driver.h"
static void* ui_window_cocoa_init(void)

6
ui/drivers/ui_cocoa.h
View File

@ -23,7 +23,11 @@
#include <boolean.h>
#include <retro_common_api.h>
#if defined(HAVE_COCOA_METAL)
#include "cocoa/cocoa_common_metal.h"
#elif defined(HAVE_COCOA)
#include "cocoa/cocoa_common.h"
#endif
#include "../ui_companion_driver.h"
@ -36,7 +40,7 @@ typedef struct ui_application_cocoa
typedef struct ui_window_cocoa
{
CocoaView *data;
void *data;
} ui_window_cocoa_t;
RETRO_END_DECLS

44
ui/drivers/ui_cocoa_metal.h
View File

@ -1,44 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2017 - Daniel De Matteis
*
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef _COCOA_METAL_UI
#define _COCOA_METAL_UI
#include <stdint.h>
#include <stddef.h>
#include <boolean.h>
#include <retro_common_api.h>
#include "cocoa/cocoa_common_metal.h"
#include "../ui_companion_driver.h"
RETRO_BEGIN_DECLS
typedef struct ui_application_cocoa
{
void *empty;
} ui_application_cocoa_t;
typedef struct ui_window_cocoa
{
void *data;
} ui_window_cocoa_t;
RETRO_END_DECLS
#endif