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

savestates: build fixes

This commit is contained in:
Flyinghead 2018-09-20 20:06:54 +02:00
parent de147549c3
commit f355dda6a4
6 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rend/soft/softrend.cpp
View File

@ -23,7 +23,7 @@
#include "rend/gles/gles.h"
u32 decoded_colors[3][65536];
static u32 decoded_colors[3][65536];
#define MAX_RENDER_WIDTH 640
#define MAX_RENDER_HEIGHT 480

17
core/serialize.cpp
View File

@ -369,14 +369,9 @@ extern u32 ta_fsm_cl;
//./core/hw/pvr/ta_vtx.o
extern bool pal_needs_update;
extern u32 _pal_rev_256[4];
extern u32 _pal_rev_16[64];
extern u32 pal_rev_256[4];
extern u32 pal_rev_16[64];
extern u32 palette16_ram[1024];
extern u32 palette32_ram[1024];
//extern u32 palette_ram[1024];
extern u32 decoded_colors[3][65536];
//extern u32 decoded_colors[3][65536];
extern u32 tileclip_val;
extern u8 f32_su8_tbl[65536];
//written but never read
@ -1027,11 +1022,6 @@ bool dc_serialize(void **data, unsigned int *total_size)
//REICAST_SA(pal_rev_256,4);
//REICAST_SA(pal_rev_16,64);
for ( i = 0 ; i < 3 ; i++ )
{
u32 *ptr = decoded_colors[i] ;
REICAST_SA(ptr,65536);
}
REICAST_S(tileclip_val);
REICAST_SA(f32_su8_tbl,65536);
REICAST_SA(FaceBaseColor,4);
@ -1424,11 +1414,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
//REICAST_USA(_pal_rev_16,64);
//REICAST_USA(pal_rev_256,4);
//REICAST_USA(pal_rev_16,64);
for ( i = 0 ; i < 3 ; i++ )
{
u32 *ptr = decoded_colors[i] ;
REICAST_USA(ptr,65536);
}
REICAST_US(tileclip_val);
REICAST_USA(f32_su8_tbl,65536);
REICAST_USA(FaceBaseColor,4);

2
shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java
View File

@ -88,7 +88,6 @@ public class Emulator extends Application {
JNIdc.limitfps(Emulator.limitfps ? 1 : 0);
JNIdc.nobatch(Emulator.nobatch ? 1 : 0);
JNIdc.nosound(Emulator.nosound ? 1 : 0);
JNIdc.delayinterrupt(Emulator.interrupt ? 1 : 0);
JNIdc.mipmaps(Emulator.mipmaps ? 1 : 0);
JNIdc.widescreen(Emulator.widescreen ? 1 : 0);
JNIdc.subdivide(Emulator.subdivide ? 1 : 0);
@ -106,7 +105,6 @@ public class Emulator extends Application {
JNIdc.dynarec(mPrefs.getBoolean(pref_dynarecopt, dynarecopt) ? 1 : 0);
JNIdc.unstable(mPrefs.getBoolean(pref_unstable, unstableopt) ? 1 : 0);
JNIdc.safemode(mPrefs.getBoolean(pref_dynsafemode, dynsafemode) ? 1 : 0);
JNIdc.delayinterrupt(mPrefs.getBoolean(pref_interrupt, interrupt) ? 1 : 0);
JNIdc.frameskip(mPrefs.getInt(pref_frameskip, frameskip));
JNIdc.pvrrender(mPrefs.getBoolean(pref_pvrrender, pvrrender) ? 1 : 0);
JNIdc.syncedrender(mPrefs.getBoolean(pref_syncedrender, syncedrender) ? 1 : 0);

1
shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/JNIdc.java
View File

@ -39,7 +39,6 @@ public final class JNIdc
public static native void limitfps(int limiter);
public static native void nobatch(int nobatch);
public static native void nosound(int noaudio);
public static native void delayinterrupt(int delayed);
public static native void mipmaps(int mipmaps);
public static native void widescreen(int stretch);
public static native void subdivide(int subdivide);

6
shell/android-studio/reicast/src/main/jni/src/Android.cpp
View File

@ -55,7 +55,6 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_broadcast(JNIEnv *env
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_limitfps(JNIEnv *env,jobject obj, jint limiter) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nobatch(JNIEnv *env,jobject obj, jint nobatch) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nosound(JNIEnv *env,jobject obj, jint noaudio) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_delayinterrupt(JNIEnv *env,jobject obj, jint delayed) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_mipmaps(JNIEnv *env,jobject obj, jint mipmaps) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_widescreen(JNIEnv *env,jobject obj, jint stretch) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_subdivide(JNIEnv *env,jobject obj, jint subdivide) __attribute__((visibility("default")));
@ -118,11 +117,6 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nosound(JNIEnv *env,j
settings.aica.NoSound = noaudio;
}
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_delayinterrupt(JNIEnv *env,jobject obj, jint delayed)
{
settings.aica.DelayInterrupt = delayed;
}
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_mipmaps(JNIEnv *env,jobject obj, jint mipmaps)
{
settings.rend.UseMipmaps = mipmaps;

1
shell/reicast.vcxproj
View File

@ -196,6 +196,7 @@
<ClCompile Include="..\core\rend\gles\gltex.cpp" />
<ClCompile Include="..\core\rend\soft\softrend.cpp" />
<ClCompile Include="..\core\rend\TexCache.cpp" />
<ClCompile Include="..\core\serialize.cpp" />
<ClCompile Include="..\core\stdclass.cpp" />
<ClCompile Include="..\core\webui\server.cpp" />
<ClCompile Include="..\core\windows\winmain.cpp" />