Get rid of ui_cocoa_metal.h

mme4crt · Feb 7, 2019 · 2599172 · 2599172
1 parent ce05185
commit 2599172
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 54 deletions.
diff --git a/gfx/drivers_context/cocoa_gl_ctx_metal.m b/gfx/drivers_context/cocoa_gl_ctx_metal.m
@@ -104,8 +104,9 @@ - (float) scale  { return 1.0f; }
 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;

diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
@@ -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 */,

diff --git a/ui/drivers/cocoa/cocoa_common_metal.m b/ui/drivers/cocoa/cocoa_common_metal.m
@@ -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>
 

diff --git a/ui/drivers/cocoa/ui_cocoa_window_metal.m b/ui/drivers/cocoa/ui_cocoa_window_metal.m
@@ -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)

diff --git a/ui/drivers/ui_cocoa.h b/ui/drivers/ui_cocoa.h
@@ -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

diff --git a/ui/drivers/ui_cocoa_metal.h b/ui/drivers/ui_cocoa_metal.h