diff --git a/Info.plist b/Info.plist index 5bea80d..6104cd4 100644 --- a/Info.plist +++ b/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.0 + 1.9.3 NSPrincipalClass OEGameCoreController OEGameCoreClass diff --git a/PPSSPP.xcodeproj/project.pbxproj b/PPSSPP.xcodeproj/project.pbxproj index d80b406..900c001 100644 --- a/PPSSPP.xcodeproj/project.pbxproj +++ b/PPSSPP.xcodeproj/project.pbxproj @@ -421,6 +421,8 @@ EE0812DA218CBADA007FD1AB /* VulkanMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE0812D3218CBADA007FD1AB /* VulkanMemory.cpp */; }; EE19A4C420B9E470005343B9 /* DataFormatGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE19A4BB20B9E46F005343B9 /* DataFormatGL.cpp */; }; EE19A4C520B9E470005343B9 /* GLQueueRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE19A4BC20B9E46F005343B9 /* GLQueueRunner.cpp */; }; + EE2B0064234BDB1E000DB0B8 /* sceUsbMic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2B0062234BDB1E000DB0B8 /* sceUsbMic.cpp */; }; + EE2B0068234BDC29000DB0B8 /* Playback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2B0066234BDC29000DB0B8 /* Playback.cpp */; }; EE7679CA20C82E89006470A2 /* Replay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE7679C920C82E88006470A2 /* Replay.cpp */; }; EE76801920C82F9B006470A2 /* spirv_glsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE7677DA20C82D0D006470A2 /* spirv_glsl.cpp */; }; EE76802120C833B9006470A2 /* spirv_cross.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE7677E920C82D0D006470A2 /* spirv_cross.cpp */; }; @@ -703,7 +705,6 @@ 3EDB61FC2012B13E00CF55BE /* dataconv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dataconv.cpp; sourceTree = ""; }; 3EDB61FE2012B18700CF55BE /* BlobFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobFileSystem.cpp; sourceTree = ""; }; 3EDB61FF2012B18700CF55BE /* BlobFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobFileSystem.h; sourceTree = ""; }; - 3EDB620A20156D2500CF55BE /* sceDisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sceDisplay.cpp; sourceTree = ""; }; 8706346A1C2516A1007FAA2F /* knownfuncs.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = knownfuncs.ini; sourceTree = ""; }; 8706346B1C2516A1007FAA2F /* langregion.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = langregion.ini; sourceTree = ""; }; 87E051301B1028FC00E870E1 /* libsfmt19937.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsfmt19937.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1593,6 +1594,11 @@ EE19A4BD20B9E46F005343B9 /* thin3d_create.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thin3d_create.h; sourceTree = ""; }; EE19A4BF20B9E46F005343B9 /* GLQueueRunner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLQueueRunner.h; sourceTree = ""; }; EE19A4C120B9E46F005343B9 /* DataFormatGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataFormatGL.h; sourceTree = ""; }; + EE2B0062234BDB1E000DB0B8 /* sceUsbMic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sceUsbMic.cpp; sourceTree = ""; }; + EE2B0063234BDB1E000DB0B8 /* sceUsbMic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sceUsbMic.h; sourceTree = ""; }; + EE2B0065234BDC29000DB0B8 /* RecordFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordFormat.h; sourceTree = ""; }; + EE2B0066234BDC29000DB0B8 /* Playback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Playback.cpp; sourceTree = ""; }; + EE2B0067234BDC29000DB0B8 /* Playback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Playback.h; sourceTree = ""; }; EE7677DA20C82D0D006470A2 /* spirv_glsl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_glsl.cpp; sourceTree = ""; }; EE7677DE20C82D0D006470A2 /* barrier.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = barrier.hpp; sourceTree = ""; }; EE7677DF20C82D0D006470A2 /* thread_group.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = thread_group.hpp; sourceTree = ""; }; @@ -3296,30 +3302,6 @@ name = IR; sourceTree = ""; }; - 3EDB620720156CA900CF55BE /* Compatibility */ = { - isa = PBXGroup; - children = ( - 3EDB620820156CCD00CF55BE /* Core */, - ); - path = Compatibility; - sourceTree = ""; - }; - 3EDB620820156CCD00CF55BE /* Core */ = { - isa = PBXGroup; - children = ( - 3EDB620920156CDA00CF55BE /* HLE */, - ); - path = Core; - sourceTree = ""; - }; - 3EDB620920156CDA00CF55BE /* HLE */ = { - isa = PBXGroup; - children = ( - 3EDB620A20156D2500CF55BE /* sceDisplay.cpp */, - ); - path = HLE; - sourceTree = ""; - }; 87E051341B102C0A00E870E1 /* sfmt19937 */ = { isa = PBXGroup; children = ( @@ -3954,6 +3936,9 @@ 8C2D4EE41824011100E65166 /* Debugger */ = { isa = PBXGroup; children = ( + EE2B0066234BDC29000DB0B8 /* Playback.cpp */, + EE2B0067234BDC29000DB0B8 /* Playback.h */, + EE2B0065234BDC29000DB0B8 /* RecordFormat.h */, EE081277218CA90B007FD1AB /* Debugger.cpp */, EE081276218CA90A007FD1AB /* Debugger.h */, 3EDB61F620129C5A00CF55BE /* Record.cpp */, @@ -4042,7 +4027,6 @@ isa = PBXGroup; children = ( 8C8447A9186B8DD500BE03D5 /* gfx */, - 3EDB620720156CA900CF55BE /* Compatibility */, 8CAFC10A1785B60F00647A96 /* Classes */, 8CAFC1181785B63900647A96 /* Supporting Files */, 8CAFA79C1785AE2A00647A96 /* Frameworks and Libraries */, @@ -4348,6 +4332,8 @@ 8CAFA8791785B3C200647A96 /* HLE */ = { isa = PBXGroup; children = ( + EE2B0062234BDB1E000DB0B8 /* sceUsbMic.cpp */, + EE2B0063234BDB1E000DB0B8 /* sceUsbMic.h */, EE08127B218CAC20007FD1AB /* KernelThreadDebugInterface.h */, EE08127A218CAC20007FD1AB /* sceUsbAcc.cpp */, EE081279218CAC20007FD1AB /* sceUsbAcc.h */, @@ -7027,6 +7013,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 8CAFA78E1785AA9900647A96; @@ -7309,6 +7296,7 @@ 3EDB61F320129C2E00CF55BE /* SamplerX86.cpp in Sources */, EE0812B9218CB23B007FD1AB /* ShaderManagerVulkan.cpp in Sources */, EE0812B1218CB23B007FD1AB /* GPU_Vulkan.cpp in Sources */, + EE2B0068234BDC29000DB0B8 /* Playback.cpp in Sources */, EE0812B2218CB23B007FD1AB /* StateMappingVulkan.cpp in Sources */, 3E3044871F21648A00B06252 /* TextureScalerGLES.cpp in Sources */, EE7680B420CB840E006470A2 /* ShaderTranslation.cpp in Sources */, @@ -7480,6 +7468,7 @@ 8CAFC3041785DAA000647A96 /* sceKernelMbx.cpp in Sources */, 8CAFC3061785DAA000647A96 /* sceKernelMemory.cpp in Sources */, 8CAFC3081785DAA000647A96 /* sceKernelModule.cpp in Sources */, + EE2B0064234BDB1E000DB0B8 /* sceUsbMic.cpp in Sources */, 8CAFC30A1785DAA000647A96 /* sceKernelMsgPipe.cpp in Sources */, 8CAFC30C1785DAA000647A96 /* sceKernelMutex.cpp in Sources */, EE7679CA20C82E89006470A2 /* Replay.cpp in Sources */, diff --git a/PPSSPPGameCore.mm b/PPSSPPGameCore.mm index da2e103..da0ebc0 100644 --- a/PPSSPPGameCore.mm +++ b/PPSSPPGameCore.mm @@ -185,7 +185,6 @@ PPSSPPGameCore *_current = 0; OEgraphicsContext->InitFromRenderThread(nullptr); _coreParam.graphicsContext = OEgraphicsContext; - _coreParam.thin3d = OEgraphicsContext ? OEgraphicsContext->GetDrawContext() : nullptr; NativeInitGraphics(OEgraphicsContext); }