mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

protocol conformance for ApplePlatform for iOS; add metal shader functions files to xcode project

Browse Source
This commit is contained in:
Yoshi Sugawara 2020-07-07 05:38:50 -10:00
parent 6308ba1acb
commit 8e1dd5def1
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
View File

@ -32,6 +32,10 @@
9210C2F724B3A32D00E6FE7C /* griffin_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2F424B3A32D00E6FE7C /* griffin_cpp.cpp */; }; 9210C2F724B3A32D00E6FE7C /* griffin_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2F424B3A32D00E6FE7C /* griffin_cpp.cpp */; };
9210C2F824B3A32D00E6FE7C /* griffin_glslang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2F524B3A32D00E6FE7C /* griffin_glslang.cpp */; }; 9210C2F824B3A32D00E6FE7C /* griffin_glslang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2F524B3A32D00E6FE7C /* griffin_glslang.cpp */; };
9210C2F924B3A32D00E6FE7C /* griffin_glslang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2F524B3A32D00E6FE7C /* griffin_glslang.cpp */; }; 9210C2F924B3A32D00E6FE7C /* griffin_glslang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2F524B3A32D00E6FE7C /* griffin_glslang.cpp */; };
9210C2FC24B4CB4900E6FE7C /* menu_pipeline.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2FA24B4CB4900E6FE7C /* menu_pipeline.metal */; };
9210C2FD24B4CB4900E6FE7C /* menu_pipeline.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2FA24B4CB4900E6FE7C /* menu_pipeline.metal */; };
9210C2FE24B4CB4900E6FE7C /* Shaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2FB24B4CB4900E6FE7C /* Shaders.metal */; };
9210C2FF24B4CB4900E6FE7C /* Shaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9210C2FB24B4CB4900E6FE7C /* Shaders.metal */; };
9222F1FF2314BA7C0097C0FD /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 9222F1FE2314BA7C0097C0FD /* assets.zip */; }; 9222F1FF2314BA7C0097C0FD /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 9222F1FE2314BA7C0097C0FD /* assets.zip */; };
9222F2002314BA7C0097C0FD /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 9222F1FE2314BA7C0097C0FD /* assets.zip */; }; 9222F2002314BA7C0097C0FD /* assets.zip in Resources */ = {isa = PBXBuildFile; fileRef = 9222F1FE2314BA7C0097C0FD /* assets.zip */; };
9222F2092315DAD50097C0FD /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9222F2082315DAD50097C0FD /* Launch Screen.storyboard */; }; 9222F2092315DAD50097C0FD /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9222F2082315DAD50097C0FD /* Launch Screen.storyboard */; };
@ -96,6 +100,8 @@
9210C2F124B3A19100E6FE7C /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; 9210C2F124B3A19100E6FE7C /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
9210C2F424B3A32D00E6FE7C /* griffin_cpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = griffin_cpp.cpp; path = ../../griffin/griffin_cpp.cpp; sourceTree = "<group>"; }; 9210C2F424B3A32D00E6FE7C /* griffin_cpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = griffin_cpp.cpp; path = ../../griffin/griffin_cpp.cpp; sourceTree = "<group>"; };
9210C2F524B3A32D00E6FE7C /* griffin_glslang.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = griffin_glslang.cpp; path = ../../griffin/griffin_glslang.cpp; sourceTree = "<group>"; }; 9210C2F524B3A32D00E6FE7C /* griffin_glslang.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = griffin_glslang.cpp; path = ../../griffin/griffin_glslang.cpp; sourceTree = "<group>"; };
9210C2FA24B4CB4900E6FE7C /* menu_pipeline.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; name = menu_pipeline.metal; path = ../../gfx/common/metal/menu_pipeline.metal; sourceTree = "<group>"; };
9210C2FB24B4CB4900E6FE7C /* Shaders.metal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.metal; name = Shaders.metal; path = ../../gfx/common/metal/Shaders.metal; sourceTree = "<group>"; };
9222F1FE2314BA7C0097C0FD /* assets.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = assets.zip; sourceTree = "<group>"; }; 9222F1FE2314BA7C0097C0FD /* assets.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = assets.zip; sourceTree = "<group>"; };
9222F2082315DAD50097C0FD /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; }; 9222F2082315DAD50097C0FD /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
9222F20A2315DD3D0097C0FD /* retroarch_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = retroarch_logo.png; sourceTree = "<group>"; }; 9222F20A2315DD3D0097C0FD /* retroarch_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = retroarch_logo.png; sourceTree = "<group>"; };
@ -340,6 +346,8 @@
9222F2082315DAD50097C0FD /* Launch Screen.storyboard */, 9222F2082315DAD50097C0FD /* Launch Screen.storyboard */,
9222F1FE2314BA7C0097C0FD /* assets.zip */, 9222F1FE2314BA7C0097C0FD /* assets.zip */,
96AFAE9C16C1D976009DE44C /* core */, 96AFAE9C16C1D976009DE44C /* core */,
9210C2FA24B4CB4900E6FE7C /* menu_pipeline.metal */,
9210C2FB24B4CB4900E6FE7C /* Shaders.metal */,
83D632D719ECFCC4009E3161 /* iOS */, 83D632D719ECFCC4009E3161 /* iOS */,
926C77D821FD1E6500103EDE /* tvOS */, 926C77D821FD1E6500103EDE /* tvOS */,
92D3D565232D8661001B0D86 /* Sources */, 92D3D565232D8661001B0D86 /* Sources */,
@ -577,6 +585,8 @@
92CC05B421FE3C1700FF79F0 /* GCDWebServerURLEncodedFormRequest.m in Sources */, 92CC05B421FE3C1700FF79F0 /* GCDWebServerURLEncodedFormRequest.m in Sources */,
92CC05B021FE3C1700FF79F0 /* GCDWebServerDataResponse.m in Sources */, 92CC05B021FE3C1700FF79F0 /* GCDWebServerDataResponse.m in Sources */,
92CC05C221FE3C6D00FF79F0 /* WebServer.m in Sources */, 92CC05C221FE3C6D00FF79F0 /* WebServer.m in Sources */,
9210C2FC24B4CB4900E6FE7C /* menu_pipeline.metal in Sources */,
9210C2FE24B4CB4900E6FE7C /* Shaders.metal in Sources */,
92CC05BA21FE3C1700FF79F0 /* GCDWebServerFileRequest.m in Sources */, 92CC05BA21FE3C1700FF79F0 /* GCDWebServerFileRequest.m in Sources */,
92CC05AE21FE3C1700FF79F0 /* GCDWebServerFileResponse.m in Sources */, 92CC05AE21FE3C1700FF79F0 /* GCDWebServerFileResponse.m in Sources */,
9210C2F624B3A32D00E6FE7C /* griffin_cpp.cpp in Sources */, 9210C2F624B3A32D00E6FE7C /* griffin_cpp.cpp in Sources */,
@ -603,6 +613,8 @@
92CC05B521FE3C1700FF79F0 /* GCDWebServerURLEncodedFormRequest.m in Sources */, 92CC05B521FE3C1700FF79F0 /* GCDWebServerURLEncodedFormRequest.m in Sources */,
92CC05B121FE3C1700FF79F0 /* GCDWebServerDataResponse.m in Sources */, 92CC05B121FE3C1700FF79F0 /* GCDWebServerDataResponse.m in Sources */,
92CC05C321FE3C6D00FF79F0 /* WebServer.m in Sources */, 92CC05C321FE3C6D00FF79F0 /* WebServer.m in Sources */,
9210C2FD24B4CB4900E6FE7C /* menu_pipeline.metal in Sources */,
9210C2FF24B4CB4900E6FE7C /* Shaders.metal in Sources */,
92CC05BB21FE3C1700FF79F0 /* GCDWebServerFileRequest.m in Sources */, 92CC05BB21FE3C1700FF79F0 /* GCDWebServerFileRequest.m in Sources */,
92CC05AF21FE3C1700FF79F0 /* GCDWebServerFileResponse.m in Sources */, 92CC05AF21FE3C1700FF79F0 /* GCDWebServerFileResponse.m in Sources */,
9210C2F724B3A32D00E6FE7C /* griffin_cpp.cpp in Sources */, 9210C2F724B3A32D00E6FE7C /* griffin_cpp.cpp in Sources */,

12
ui/drivers/ui_cocoatouch.m
View File

@ -319,7 +319,6 @@ enum
@implementation RetroArch_iOS @implementation RetroArch_iOS
#pragma mark - ApplePlatform #pragma mark - ApplePlatform
#ifdef HAVE_COCOA_METAL #ifdef HAVE_COCOA_METAL
-(id)renderView { -(id)renderView {
return _renderView; return _renderView;
@ -376,6 +375,17 @@ enum
return _vt; return _vt;
} }
- (void)setVideoMode:(gfx_ctx_mode_t)mode {
// no-op for iOS?
}
- (void)setCursorVisible:(bool)v {
// no-op for iOS
}
- (bool)setDisableDisplaySleep:(bool)disable {
// no-op for iOS
}
#endif #endif
+ (RetroArch_iOS*)get + (RetroArch_iOS*)get