From d8d12cac8b2483da102fc6f6d79dc224391fe4e3 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 14 Mar 2020 15:14:31 -0500 Subject: [PATCH] kill more psp, and remove some methods from coreComm that were only used by the former psp core --- BizHawk.Client.Common/RomLoader.cs | 4 ---- .../Extensions/CoreExtensions.cs | 2 -- BizHawk.Client.EmuHawk/MainForm.cs | 2 -- BizHawk.Client.EmuHawk/Properties/Resources.cs | 1 - BizHawk.Client.EmuHawk/images/ppsspp.png | Bin 841 -> 0 bytes BizHawk.Emulation.Common/CoreComms.cs | 2 -- 6 files changed, 11 deletions(-) delete mode 100644 BizHawk.Client.EmuHawk/images/ppsspp.png diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index d58bb2d54f..8b79c36602 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -19,7 +19,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x; using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.PCEngine; using BizHawk.Emulation.Cores.Sega.GGHawkLink; -using BizHawk.Emulation.Cores.Sony.PSP; using BizHawk.Emulation.Cores.Sony.PSX; using BizHawk.Emulation.Cores.Computers.SinclairSpectrum; using BizHawk.Emulation.Cores.Arcades.MAME; @@ -565,9 +564,6 @@ namespace BizHawk.Client.Common nextEmulator = new Saturnus(nextComm, new[] { disc }, Deterministic, (Saturnus.Settings)GetCoreSettings(), (Saturnus.SyncSettings)GetCoreSyncSettings()); break; - case "PSP": - nextEmulator = new PSP(nextComm, file.Name); - break; case "PSX": nextEmulator = new Octoshock(nextComm, new List(new[] { disc }), new List(new[] { Path.GetFileNameWithoutExtension(path) }), null, GetCoreSettings(), GetCoreSyncSettings()); if (game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase) diff --git a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs index da75221162..352480524a 100644 --- a/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs @@ -7,7 +7,6 @@ using BizHawk.Emulation.Cores.Nintendo.SNES; using BizHawk.Emulation.Cores.Nintendo.Gameboy; using BizHawk.Emulation.Cores.Nintendo.SNES9X; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; -using BizHawk.Emulation.Cores.Sony.PSP; using BizHawk.Emulation.Cores.Arcades.MAME; using BizHawk.Emulation.Cores.Nintendo.GBA; using BizHawk.Emulation.Cores.Sega.MasterSystem; @@ -30,7 +29,6 @@ namespace BizHawk.Client.EmuHawk.CoreExtensions QuickNES _ => Properties.Resources.QuickNes, LibsnesCore _ => Properties.Resources.bsnes, GPGX _ => Properties.Resources.genplus, - PSP _ => Properties.Resources.ppsspp, Gameboy _ => Properties.Resources.gambatte, Snes9x _ => Properties.Resources.snes9x, MAME _ => Properties.Resources.mame, diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 45f7b66577..27ebd729f6 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -86,8 +86,6 @@ namespace BizHawk.Client.EmuHawk { return new CoreComm(ShowMessageCoreComm, NotifyCoreComm) { - ReleaseGLContext = o => GLManager.ReleaseGLContext(o), - RequestGLContext = (major, minor, forward) => GLManager.CreateGLContext(major, minor, forward), ActivateGLContext = gl => GLManager.Activate((GLManager.ContextRef)gl), DeactivateGLContext = () => GLManager.Deactivate() }; diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.cs b/BizHawk.Client.EmuHawk/Properties/Resources.cs index 654f3059d7..f52143c42e 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.cs @@ -142,7 +142,6 @@ namespace BizHawk.Client.EmuHawk.Properties { internal static readonly Bitmap placeholder_bitmap = ReadEmbeddedBitmap("placeholder_bitmap"); internal static readonly Icon poke_MultiSize = ReadEmbeddedIcon("poke"); internal static readonly Bitmap poke = ReadEmbeddedBitmap("poke"); - internal static readonly Bitmap ppsspp = ReadEmbeddedBitmap("ppsspp"); internal static readonly Icon Previous_MultiSize = ReadEmbeddedIcon("Previous"); internal static readonly Bitmap Previous = ReadEmbeddedBitmap("Previous"); internal static readonly Icon QuickNes_MultiSize = ReadEmbeddedIcon("QuickNes"); diff --git a/BizHawk.Client.EmuHawk/images/ppsspp.png b/BizHawk.Client.EmuHawk/images/ppsspp.png deleted file mode 100644 index 4eca06dcae21274ad4d70364daa36426c65d8b49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 841 zcmV-P1GfB$P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0008GNklh$dcAI zWr7Oh2kr&!+##(CThga**jKr7-{+p)Xa6^DJo?|Ka*{Sw34S1=sLookeDC{pcV7I5 z;rZw8{0F)u4XT7NNS(4~*UFnu|1ZD(e^6-CD_tFJWX&7L%OD<=DvQa@` z$I60zc=kV^S^cfh5woJw*K`j=?zYwvEliG^LOE1%bU058c;bSgPN5qQ$YPJO`z$? zv3)D%#`G@V>Q&ks8`3)eNXqQZ{{tIl%@1ywH*dy?>;G5YfOu`m)kpu!SMB|4mtG|T zbn=|qmMzEs&p&(T|JvIx{x1hgmMq=<%ddWVzgNYCV)xSS@XWcJ{>?sj_x}v2w9?v=d@Qf9CH z+qCEG|E9g?|5tB2@jr9%*8k3x-R%sf5g9^7%Xa*k4fG!<;HI3s`M+(?ng1R&{o8>G zrew`q|KF{qZ<%#=RfK2#gwx(llXuw{H#b^mRl2LY2l9i$jWN7;{^gc^=l?eVZK&LO z{C`OAyw5hdwGp`sH~s+y*sN36|Hn*R^cpCp3l2DR;8N8+D}3VO4?xrRIuy6GSZ0)4 z`L|5nzYG{2Aa5-KriI?am;O6dbQVLkpaQ*+1VJt#QBEKeZhBDr^tFqxJo-Q5?Ct-( zz_ie`_uPN)=BaC;(u9FyS$lEo-n0LkfnKWs23qdAL;nMM=062W5tp%S^Xe><=WYC- zvS`cyu*u8*dbdo!=~Uja2qiOD1;^LGcW)EY^Ht< T<%>9900000NkvXXu0mjfaW|)8 diff --git a/BizHawk.Emulation.Common/CoreComms.cs b/BizHawk.Emulation.Common/CoreComms.cs index 874a73f4d3..bd8041caa9 100644 --- a/BizHawk.Emulation.Common/CoreComms.cs +++ b/BizHawk.Emulation.Common/CoreComms.cs @@ -45,8 +45,6 @@ namespace BizHawk.Emulation.Common /// public Action Notify { get; } - public Func RequestGLContext { get; set; } - public Action ReleaseGLContext { get; set; } public Action ActivateGLContext { get; set; } public Action DeactivateGLContext { get; set; } // this shouldn't be necessary.. frontend should be changing context before it does anything.. but for now.. }