Rework and fix up invisible allocations and sound/video format init in nyma cores.
See the submodule commits for the tech details. Fixes #2365. As a side effect, Faust state sizes should be moderately smaller now.
This commit is contained in:
parent
d170972e3c
commit
6047a12ad8
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -10,12 +10,4 @@ cd sameboy && make -f Makefile $1 -j && cd -
|
||||||
cd snes9x && make -f Makefile $1 -j && cd -
|
cd snes9x && make -f Makefile $1 -j && cd -
|
||||||
cd uzem && make -f Makefile $1 -j && cd -
|
cd uzem && make -f Makefile $1 -j && cd -
|
||||||
cd vb && make -f Makefile $1 -j && cd -
|
cd vb && make -f Makefile $1 -j && cd -
|
||||||
cd nyma && make -f faust.mak $1 -j && cd -
|
cd nyma && ./make-all-released-cores.sh $1 && cd -
|
||||||
cd nyma && make -f hyper.mak $1 -j && cd -
|
|
||||||
#cd nyma && make -f lynx.mak $1 -j && cd -
|
|
||||||
cd nyma && make -f ngp.mak $1 -j && cd -
|
|
||||||
cd nyma && make -f pcfx.mak $1 -j && cd -
|
|
||||||
cd nyma && make -f ss.mak $1 -j && cd -
|
|
||||||
cd nyma && make -f turbo.mak $1 -j && cd -
|
|
||||||
#cd nyma && make -f vb.mak $1 -j && cd -
|
|
||||||
#cd nyma && make -f wswan.mak $1 -j && cd -
|
|
||||||
|
|
|
@ -45,13 +45,14 @@ static void Setup()
|
||||||
);
|
);
|
||||||
EES = new EmulateSpecStruct();
|
EES = new EmulateSpecStruct();
|
||||||
EES->surface = Surf;
|
EES->surface = Surf;
|
||||||
EES->VideoFormatChanged = true;
|
|
||||||
EES->LineWidths = new int32_t[Game->fb_height];
|
EES->LineWidths = new int32_t[Game->fb_height];
|
||||||
memset(EES->LineWidths, 0xff, Game->fb_height * sizeof(int32_t));
|
memset(EES->LineWidths, 0xff, Game->fb_height * sizeof(int32_t));
|
||||||
EES->SoundBuf = samples;
|
EES->SoundBuf = samples;
|
||||||
EES->SoundBufMaxSize = 22050;
|
EES->SoundBufMaxSize = 22050;
|
||||||
EES->SoundFormatChanged = true;
|
|
||||||
EES->SoundRate = 44100;
|
EES->SoundRate = 44100;
|
||||||
|
|
||||||
|
if (Game->FormatsChanged)
|
||||||
|
Game->FormatsChanged(EES);
|
||||||
}
|
}
|
||||||
|
|
||||||
ECL_EXPORT bool InitRom(const InitData& data)
|
ECL_EXPORT bool InitRom(const InitData& data)
|
||||||
|
@ -141,8 +142,6 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo& frame)
|
||||||
Game->TransformInput();
|
Game->TransformInput();
|
||||||
Game->Emulate(EES);
|
Game->Emulate(EES);
|
||||||
|
|
||||||
EES->VideoFormatChanged = false;
|
|
||||||
EES->SoundFormatChanged = false;
|
|
||||||
frame.Cycles = EES->MasterCycles;
|
frame.Cycles = EES->MasterCycles;
|
||||||
frame.Lagged = LagFlag;
|
frame.Lagged = LagFlag;
|
||||||
if (!(frame.BizhawkFlags & BizhawkFlags::SkipSoundening))
|
if (!(frame.BizhawkFlags & BizhawkFlags::SkipSoundening))
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
make -f turbo.mak $1 -j
|
||||||
|
make -f hyper.mak $1 -j
|
||||||
|
make -f ngp.mak $1 -j
|
||||||
|
make -f faust.mak $1 -j
|
||||||
|
make -f pcfx.mak $1 -j
|
||||||
|
make -f ss.mak $1 -j
|
||||||
|
# make -f lynx.mak $1 -j
|
||||||
|
# make -f vb.mak $1 -j
|
||||||
|
# make -f wswan.mak $1 -j
|
|
@ -1 +1 @@
|
||||||
Subproject commit 29a9e805edba65e0f2f62403b1d56d64b295ae65
|
Subproject commit f8f03f67a9d3b4edd42ee817350699dbcd90eef4
|
|
@ -1,8 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
make -f turbo.mak install -j
|
|
||||||
make -f hyper.mak install -j
|
|
||||||
make -f ngp.mak install -j
|
|
||||||
make -f faust.mak install -j
|
|
||||||
make -f pcfx.mak install -j
|
|
||||||
make -f ss.mak install -j
|
|
|
@ -1,17 +0,0 @@
|
||||||
# in case we have libs that need to build before cores, I split this up into two parts
|
|
||||||
LIBS = emulibc libco
|
|
||||||
CORES = gpgx libsnes pcfx vb ngp picodrive sameboy ss uzem
|
|
||||||
|
|
||||||
default: all
|
|
||||||
|
|
||||||
FORCE:
|
|
||||||
|
|
||||||
$(CORES) : FORCE $(LIBS)
|
|
||||||
make -C $@ $(MAKECMDGOALS)
|
|
||||||
|
|
||||||
$(LIBS) ::
|
|
||||||
make -C $@ $(MAKECMDGOALS)
|
|
||||||
|
|
||||||
|
|
||||||
all clean : $(CORES)
|
|
||||||
|
|
Loading…
Reference in New Issue