ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a few libretro wrapper tweaks

This commit is contained in:
goyuken 2013-12-11 02:19:35 +00:00
parent a7fabedfcd
commit d12f4a10c6
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BizHawk.Emulation.Common/LibRetro.cs
View File

@ -353,7 +353,7 @@ namespace BizHawk.Emulation.Common
public string meta;
}
// standard callbacks
#region callback prototypes
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
[return:MarshalAs(UnmanagedType.U1)]
public delegate bool retro_environment_t(RETRO_ENVIRONMENT cmd, IntPtr data);
@ -367,8 +367,9 @@ namespace BizHawk.Emulation.Common
public delegate void retro_input_poll_t();
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate short retro_input_state_t(uint port, uint device, uint index, uint id);
#endregion
// entry points
#region entry point prototypes
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void epretro_set_environment(retro_environment_t cb);
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
@ -423,7 +424,9 @@ namespace BizHawk.Emulation.Common
public delegate IntPtr epretro_get_memory_data(RETRO_MEMORY id);
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate uint epretro_get_memory_size(RETRO_MEMORY id);
#endregion
#region entry points
// these are all hooked up by reflection on dll load
public epretro_set_environment retro_set_environment;
public epretro_set_video_refresh retro_set_video_refresh;
public epretro_set_audio_sample retro_set_audio_sample;
@ -452,6 +455,7 @@ namespace BizHawk.Emulation.Common
public epretro_get_region retro_get_region;
public epretro_get_memory_data retro_get_memory_data;
public epretro_get_memory_size retro_get_memory_size;
#endregion
private static Dictionary<IntPtr, LibRetro> AttachedCores = new Dictionary<IntPtr, LibRetro>();
private IntPtr hModule = IntPtr.Zero;
@ -514,16 +518,7 @@ namespace BizHawk.Emulation.Common
private static IEnumerable<FieldInfo> GetAllEntryPoints()
{
var fields = typeof(LibRetro).GetFields();
foreach (var field in fields)
{
if (field.FieldType.Name.StartsWith("epretro"))
{
// this is one of the entry point delegates
yield return field;
}
}
yield break;
return typeof(LibRetro).GetFields().Where((field) => field.FieldType.Name.StartsWith("epretro"));
}
private void ClearAllEntryPoints()

9
BizHawk.Emulation.Common/LibRetroEmulator.cs
View File

@ -180,6 +180,7 @@ namespace BizHawk.Emulation.Common
return false;
}
savebuff = new byte[retro.retro_serialize_size()];
savebuff2 = new byte[savebuff.Length + 13];
}
LibRetro.retro_system_av_info av = new LibRetro.retro_system_av_info();
@ -297,6 +298,7 @@ namespace BizHawk.Emulation.Common
#region savestates
private byte[] savebuff;
private byte[] savebuff2;
public void SaveStateText(System.IO.TextWriter writer)
{
@ -342,7 +344,12 @@ namespace BizHawk.Emulation.Common
public byte[] SaveStateBinary()
{
throw new NotImplementedException();
var ms = new System.IO.MemoryStream(savebuff2, true);
var bw = new System.IO.BinaryWriter(ms);
SaveStateBinary(bw);
bw.Flush();
ms.Close();
return savebuff2;
}
public bool BinarySaveStatesPreferred { get { return true; } }