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

Use actual doubles for figuring out aspect ratio 

Fixes issues when mame sends over < 1 bounds which round down to 0 with a long cast (resulting in div by 0 exceptions)
Also fix some oopsies with incorrect function signatures.
Remove MAME string docs as they aren't really relevant anymore, as only MameGetString handles lua string handling now
This commit is contained in:
CasualPokePlayer 2022-11-15 00:57:30 -08:00
parent 64044845a6
commit eec86ad81a
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/BizHawk.Emulation.Cores/Arcades/MAME/LibMAME.cs
View File

@ -44,10 +44,10 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
public abstract int mame_sound_get_samples(short[] buffer);
[BizImport(cc)]
public abstract int mame_video_get_dimensions(out int width, out int height);
public abstract void mame_video_get_dimensions(out int width, out int height);
[BizImport(cc)]
public abstract int mame_video_get_pixels(int[] buffer);
public abstract void mame_video_get_pixels(int[] buffer);
[UnmanagedFunctionPointer(cc)]
public delegate void FilenameCallbackDelegate(string name);
@ -86,30 +86,31 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
[BizImport(cc)]
public abstract void mame_lua_execute(string code);
// get bool
[BizImport(cc)]
public abstract bool mame_lua_get_bool(string code);
// get int
[BizImport(cc)]
public abstract int mame_lua_get_int(string code);
// get long
// nb: this is actually a double cast to long internally
[BizImport(cc)]
public abstract long mame_lua_get_long(string code);
// get bool
[BizImport(cc)]
public abstract bool mame_lua_get_bool(string code);
/// <summary>
/// MAME's luaengine uses lua strings to return C strings as well as
/// binary buffers. You're meant to know which you're going to get and
/// handle that accordingly. When we want to get a C string, we
/// Marshal.PtrToStringAnsi(). With buffers, we Marshal.Copy()
/// to our new buffer. MameGetString() only covers the former
/// because it's the same steps every time, while buffers use to
/// need aditional logic. In both cases MAME wants us to manually
/// free the string buffer. It's made that way to make the buffer
/// persist actoss C API calls.
/// Struct for indirectly returning doubles
/// This is needed due to floating point types
/// being unsupported by the msabi to sysv adapter
/// </summary>
public struct IndirectDouble
{
public double val;
}
// get double
[BizImport(cc)]
public abstract void mame_lua_get_double(string code, out IndirectDouble ret);
// get string
[BizImport(cc)]

10
src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.IVideoProvider.cs
View File

@ -34,12 +34,12 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
private void UpdateAspect()
{
int x = (int)_core.mame_lua_get_long(MAMELuaCommand.GetBoundX);
int y = (int)_core.mame_lua_get_long(MAMELuaCommand.GetBoundY);
VirtualHeight = BufferWidth > BufferHeight * x / y
? BufferWidth * y / x
_core.mame_lua_get_double(MAMELuaCommand.GetBoundX, out var x);
_core.mame_lua_get_double(MAMELuaCommand.GetBoundY, out var y);
VirtualHeight = BufferWidth > BufferHeight * x.val / y.val
? (int)Math.Round(BufferWidth * y.val / x.val)
: BufferHeight;
VirtualWidth = VirtualHeight * x / y;
VirtualWidth = (int)Math.Round(VirtualHeight * x.val / y.val);
}
private void UpdateVideo()