BUildfix

Author: LibretroAdmin

gfx/common/metal_view.h

@@ -0,0 +1,40 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2018-2019 - Stuart Carnie
+ *  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/>.
+ */
+
+/* MetalView is the MTKView subclass owned by the Metal driver
+ * (gfx/drivers/metal.m).  Its full @implementation lives there.
+ *
+ * This header exists because the @interface needs to be visible to:
+ *   - gfx/drivers/metal.m            (the file that defines it)
+ *   - ui/drivers/ui_cocoa.m          (instantiates it as the render view)
+ *   - ui/drivers/ui_cocoatouch.m     (ditto, plus calls setDrawableSize:)
+ *
+ * On Apple platforms all three of those .m files end up in a single
+ * translation unit via griffin/griffin_objc.m, so a sharable header
+ * with include guards is the only way to declare MetalView once
+ * without an Obj-C duplicate-class error.  Keep this file minimal --
+ * the bulk of what used to live in gfx/common/metal_common.h is now
+ * inlined into metal.m where it belongs. */
+
+#ifndef METAL_VIEW_H__
+#define METAL_VIEW_H__
+
+#import <MetalKit/MetalKit.h>
+
+@interface MetalView : MTKView
+@end
+
+#endif

gfx/drivers/metal.m

@@ -326,8 +326,7 @@ - (void)updateFrame:(void const *)src pitch:(NSUInteger)pitch;
 
 #pragma mark - Driver Classes
 
-@interface MetalView : MTKView
-@end
+#include "../common/metal_view.h"
 
 @interface FrameView : NSObject
 

pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj

@@ -339,6 +339,7 @@
 		05A8C71320DB72F000FF7857 /* video_filter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = video_filter.h; sourceTree = "<group>"; };
 		05A8C73920DB72F100FF7857 /* font_driver.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = font_driver.c; sourceTree = "<group>"; };
 		05A8C73C20DB72F100FF7857 /* vulkan_common.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = vulkan_common.c; sourceTree = "<group>"; };
+		DEAD000000000000DEADBEE1 /* metal_view.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = metal_view.h; sourceTree = "<group>"; };
 		05A8C74E20DB72F100FF7857 /* Shaders.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = Shaders.metal; sourceTree = "<group>"; };
 		05A8C75120DB72F100FF7857 /* metal_shader_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = metal_shader_types.h; sourceTree = "<group>"; };
 		05A8C75D20DB72F100FF7857 /* gl_common.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gl_common.c; sourceTree = "<group>"; };
@@ -983,6 +984,7 @@
 				0538874E20DDD5C600769232 /* dxgi_common.h */,
 				05A8C75D20DB72F100FF7857 /* gl_common.c */,
 				05A8C76F20DB72F100FF7857 /* gl_common.h */,
+				DEAD000000000000DEADBEE1 /* metal_view.h */,
 				05A8C73C20DB72F100FF7857 /* vulkan_common.c */,
 				05A8C76820DB72F100FF7857 /* vulkan_common.h */,
 			);

ui/drivers/ui_cocoa.m

@@ -46,13 +46,7 @@
 #include <IOKit/hidsystem/IOLLEvent.h>
 
 #if defined(HAVE_COCOA_METAL)
-/* MetalView is the MTKView subclass owned by the Metal driver
- * (gfx/drivers/metal.m).  This UI file only needs to instantiate it as
- * the render view; the full class lives in metal.m.  Declared inline
- * here to avoid pulling in the entire Metal driver header surface. */
-#import <MetalKit/MetalKit.h>
-@interface MetalView : MTKView
-@end
+#include "../../gfx/common/metal_view.h"
 #endif
 
 #include "../ui_companion_driver.h"

ui/drivers/ui_cocoatouch.m

@@ -30,14 +30,7 @@
 #include "cocoa/apple_platform.h"
 
 #if defined(HAVE_COCOA_METAL)
-/* MetalView is the MTKView subclass owned by the Metal driver
- * (gfx/drivers/metal.m).  This UI file only needs to instantiate it as
- * the render view and call setDrawableSize: on it; the full class
- * lives in metal.m.  Declared inline here to avoid pulling in the
- * entire Metal driver header surface. */
-#import <MetalKit/MetalKit.h>
-@interface MetalView : MTKView
-@end
+#include "../../gfx/common/metal_view.h"
 #endif
 
 #include "../ui_companion_driver.h"