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

Merge pull request #1338 from reicast/lk/abandoned 

Core: Fix formatting of configuration options
This commit is contained in:
Abandoned Cart 2018-08-27 01:01:14 -04:00 committed by GitHub
parent e138241bce 5bdc362da3
commit fb4b5de863
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 31 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/hw/pvr/Renderer_if.cpp
View File

@ -367,7 +367,7 @@ void rend_start_render()
#if HOST_OS==OS_WINDOWS && 0 #if HOST_OS==OS_WINDOWS && 0
printf("max: idx: %d, vtx: %d, op: %d, pt: %d, tr: %d, mvo: %d, modt: %d, ov: %d\n", max_idx, max_vtx, max_op, max_pt, max_tr, max_mvo, max_modt, ovrn); printf("max: idx: %d, vtx: %d, op: %d, pt: %d, tr: %d, mvo: %d, modt: %d, ov: %d\n", max_idx, max_vtx, max_op, max_pt, max_tr, max_mvo, max_modt, ovrn);
#endif #endif
if (QueueRender(ctx) || settings.pvr.QueueRender) if (QueueRender(ctx))
{ {
palette_update(); palette_update();
#if !defined(TARGET_NO_THREADS) #if !defined(TARGET_NO_THREADS)

62
core/nullDC.cpp
View File

@ -286,47 +286,46 @@ void dc_stop()
void LoadSettings() void LoadSettings()
{ {
#ifndef _ANDROID #ifndef _ANDROID
settings.dynarec.Enable = cfgLoadInt("config", "Dynarec.Enabled", 1) != 0; settings.dynarec.Enable = cfgLoadInt("config", "Dynarec.Enabled", 1) != 0;
settings.dynarec.idleskip = cfgLoadInt("config", "Dynarec.idleskip", 1) != 0; settings.dynarec.idleskip = cfgLoadInt("config", "Dynarec.idleskip", 1) != 0;
settings.dynarec.unstable_opt = cfgLoadInt("config", "Dynarec.unstable-opt", 0); settings.dynarec.unstable_opt = cfgLoadInt("config", "Dynarec.unstable-opt", 0);
settings.dynarec.safemode = cfgLoadInt("config", "Dynarec.safemode", 0); settings.dynarec.safemode = cfgLoadInt("config", "Dynarec.safemode", 0);
//disable_nvmem can't be loaded, because nvmem init is before cfg load //disable_nvmem can't be loaded, because nvmem init is before cfg load
settings.dreamcast.cable = cfgLoadInt("config", "Dreamcast.Cable", 3); settings.dreamcast.cable = cfgLoadInt("config", "Dreamcast.Cable", 3);
settings.dreamcast.RTC = cfgLoadInt("config", "Dreamcast.RTC", GetRTC_now()); settings.dreamcast.RTC = cfgLoadInt("config", "Dreamcast.RTC", GetRTC_now());
settings.dreamcast.region = cfgLoadInt("config", "Dreamcast.Region", 3); settings.dreamcast.region = cfgLoadInt("config", "Dreamcast.Region", 3);
settings.dreamcast.broadcast = cfgLoadInt("config", "Dreamcast.Broadcast", 4); settings.dreamcast.broadcast = cfgLoadInt("config", "Dreamcast.Broadcast", 4);
settings.aica.LimitFPS = cfgLoadInt("config", "aica.LimitFPS", 1); settings.aica.LimitFPS = cfgLoadInt("config", "aica.LimitFPS", 1);
settings.aica.NoBatch = cfgLoadInt("config", "aica.NoBatch", 0); settings.aica.NoBatch = cfgLoadInt("config", "aica.NoBatch", 0);
settings.aica.NoSound = cfgLoadInt("config", "aica.NoSound", 0); settings.aica.NoSound = cfgLoadInt("config", "aica.NoSound", 0);
settings.aica.DelayInterrupt = cfgLoadInt("config", "aica.DelayInterrupt", 0); settings.aica.DelayInterrupt = cfgLoadInt("config", "aica.DelayInterrupt", 0);
settings.rend.UseMipmaps = cfgLoadInt("config", "rend.UseMipmaps", 1); settings.rend.UseMipmaps = cfgLoadInt("config", "rend.UseMipmaps", 1);
settings.rend.WideScreen = cfgLoadInt("config", "rend.WideScreen", 0); settings.rend.WideScreen = cfgLoadInt("config", "rend.WideScreen", 0);
settings.rend.ModifierVolumes = cfgLoadInt("config", "rend.ModifierVolumes", 1); settings.rend.ModifierVolumes = cfgLoadInt("config", "rend.ModifierVolumes", 1);
settings.rend.Clipping = cfgLoadInt("config", "rend.Clipping", 1); settings.rend.Clipping = cfgLoadInt("config", "rend.Clipping", 1);
settings.pvr.subdivide_transp = cfgLoadInt("config", "pvr.Subdivide", 0); settings.pvr.subdivide_transp = cfgLoadInt("config", "pvr.Subdivide", 0);
settings.pvr.ta_skip = cfgLoadInt("config", "ta.skip", 0); settings.pvr.ta_skip = cfgLoadInt("config", "ta.skip", 0);
settings.pvr.rend = cfgLoadInt("config", "pvr.rend", 0); settings.pvr.rend = cfgLoadInt("config", "pvr.rend", 0);
settings.pvr.MaxThreads = cfgLoadInt("config", "pvr.MaxThreads", 3); settings.pvr.MaxThreads = cfgLoadInt("config", "pvr.MaxThreads", 3);
settings.pvr.SynchronousRender = cfgLoadInt("config", "pvr.SynchronousRendering", 0); settings.pvr.SynchronousRender = cfgLoadInt("config", "pvr.SynchronousRendering", 0);
settings.pvr.QueueRender = cfgLoadInt("config", "pvr.QueueRender", 0);
settings.debug.SerialConsole = cfgLoadInt("config", "Debug.SerialConsoleEnabled", 0) != 0; settings.debug.SerialConsole = cfgLoadInt("config", "Debug.SerialConsoleEnabled", 0) != 0;
settings.bios.UseReios = cfgLoadInt("config", "bios.UseReios", 0); settings.bios.UseReios = cfgLoadInt("config", "bios.UseReios", 0);
settings.reios.ElfFile = cfgLoadStr("reios", "ElfFile", ""); settings.reios.ElfFile = cfgLoadStr("reios", "ElfFile", "");
settings.validate.OpenGlChecks = cfgLoadInt("validate", "OpenGlChecks", 0) != 0; settings.validate.OpenGlChecks = cfgLoadInt("validate", "OpenGlChecks", 0) != 0;
#endif #endif
settings.pvr.HashLogFile = cfgLoadStr("testing", "ta.HashLogFile", ""); settings.pvr.HashLogFile = cfgLoadStr("testing", "ta.HashLogFile", "");
settings.pvr.HashCheckFile = cfgLoadStr("testing", "ta.HashCheckFile", ""); settings.pvr.HashCheckFile = cfgLoadStr("testing", "ta.HashCheckFile", "");
#if SUPPORT_DISPMANX #if SUPPORT_DISPMANX
settings.dispmanx.Width = cfgLoadInt("dispmanx","width",640); settings.dispmanx.Width = cfgLoadInt("dispmanx","width",640);
settings.dispmanx.Height = cfgLoadInt("dispmanx","height",480); settings.dispmanx.Height = cfgLoadInt("dispmanx","height",480);
settings.dispmanx.Keep_Aspect = cfgLoadBool("dispmanx","maintain_aspect",true); settings.dispmanx.Keep_Aspect = cfgLoadBool("dispmanx","maintain_aspect",true);
#endif #endif
@ -337,8 +336,8 @@ void LoadSettings()
#endif #endif
#if USE_OMX #if USE_OMX
settings.omx.Audio_Latency = cfgLoadInt("omx","audio_latency",100); settings.omx.Audio_Latency = cfgLoadInt("omx","audio_latency",100);
settings.omx.Audio_HDMI = cfgLoadBool("omx","audio_hdmi",true); settings.omx.Audio_HDMI = cfgLoadBool("omx","audio_hdmi",true);
#endif #endif
/* /*
@ -354,22 +353,21 @@ void LoadCustom()
char *reios_id = reios_disk_id(); char *reios_id = reios_disk_id();
cfgSaveStr(reios_id, "software.name", reios_software_name); cfgSaveStr(reios_id, "software.name", reios_software_name);
settings.dynarec.Enable = cfgLoadInt(reios_id,"Dynarec.Enabled", settings.dynarec.Enable ? 1 : 0) != 0; settings.dynarec.Enable = cfgLoadInt(reios_id,"Dynarec.Enabled", settings.dynarec.Enable ? 1 : 0) != 0;
settings.dynarec.idleskip = cfgGameInt(reios_id,"Dynarec.idleskip", settings.dynarec.idleskip ? 1 : 0) != 0; settings.dynarec.idleskip = cfgGameInt(reios_id,"Dynarec.idleskip", settings.dynarec.idleskip ? 1 : 0) != 0;
settings.dynarec.unstable_opt = cfgGameInt(reios_id,"Dynarec.unstable-opt", settings.dynarec.unstable_opt); settings.dynarec.unstable_opt = cfgGameInt(reios_id,"Dynarec.unstable-opt", settings.dynarec.unstable_opt);
settings.dynarec.safemode = cfgGameInt(reios_id,"Dynarec.safemode", settings.dynarec.safemode); settings.dynarec.safemode = cfgGameInt(reios_id,"Dynarec.safemode", settings.dynarec.safemode);
settings.aica.DelayInterrupt = cfgLoadInt(reios_id,"aica.DelayInterrupt", settings.aica.DelayInterrupt); settings.aica.DelayInterrupt = cfgLoadInt(reios_id,"aica.DelayInterrupt", settings.aica.DelayInterrupt);
settings.rend.ModifierVolumes = cfgGameInt(reios_id,"rend.ModifierVolumes", settings.rend.ModifierVolumes); settings.rend.ModifierVolumes = cfgGameInt(reios_id,"rend.ModifierVolumes", settings.rend.ModifierVolumes);
settings.rend.Clipping = cfgGameInt(reios_id,"rend.Clipping", settings.rend.Clipping); settings.rend.Clipping = cfgGameInt(reios_id,"rend.Clipping", settings.rend.Clipping);
settings.pvr.subdivide_transp = cfgGameInt(reios_id,"pvr.Subdivide", settings.pvr.subdivide_transp); settings.pvr.subdivide_transp = cfgGameInt(reios_id,"pvr.Subdivide", settings.pvr.subdivide_transp);
settings.pvr.ta_skip = cfgGameInt(reios_id,"ta.skip", settings.pvr.ta_skip); settings.pvr.ta_skip = cfgGameInt(reios_id,"ta.skip", settings.pvr.ta_skip);
settings.pvr.rend = cfgGameInt(reios_id,"pvr.rend", settings.pvr.rend); settings.pvr.rend = cfgGameInt(reios_id,"pvr.rend", settings.pvr.rend);
settings.pvr.MaxThreads = cfgGameInt(reios_id, "pvr.MaxThreads", settings.pvr.MaxThreads); settings.pvr.MaxThreads = cfgGameInt(reios_id, "pvr.MaxThreads", settings.pvr.MaxThreads);
settings.pvr.SynchronousRender = cfgGameInt(reios_id, "pvr.SynchronousRendering", settings.pvr.SynchronousRender); settings.pvr.SynchronousRender = cfgGameInt(reios_id, "pvr.SynchronousRendering", settings.pvr.SynchronousRender);
settings.pvr.QueueRender = cfgLoadInt(reios_id, "pvr.QueueRender", settings.pvr.QueueRender);
} }
void SaveSettings() void SaveSettings()

1
core/types.h
View File

@ -717,7 +717,6 @@ struct settings_t
u32 MaxThreads; u32 MaxThreads;
u32 SynchronousRender; u32 SynchronousRender;
u32 QueueRender;
string HashLogFile; string HashLogFile;
string HashCheckFile; string HashCheckFile;

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

@ -25,7 +25,6 @@ public class Emulator extends Application {
public static final String pref_frameskip = "frame_skip"; public static final String pref_frameskip = "frame_skip";
public static final String pref_pvrrender = "pvr_render"; public static final String pref_pvrrender = "pvr_render";
public static final String pref_syncedrender = "synced_render"; public static final String pref_syncedrender = "synced_render";
public static final String pref_queuerender = "queue_render";
public static final String pref_modvols = "modifier_volumes"; public static final String pref_modvols = "modifier_volumes";
public static final String pref_bootdisk = "boot_disk"; public static final String pref_bootdisk = "boot_disk";
public static final String pref_usereios = "use_reios"; public static final String pref_usereios = "use_reios";
@ -47,7 +46,6 @@ public class Emulator extends Application {
public static int frameskip = 0; public static int frameskip = 0;
public static boolean pvrrender = false; public static boolean pvrrender = false;
public static boolean syncedrender = false; public static boolean syncedrender = false;
public static boolean queuerender = false;
public static boolean modvols = true; public static boolean modvols = true;
public static String bootdisk = "null"; public static String bootdisk = "null";
public static boolean usereios = false; public static boolean usereios = false;
@ -72,7 +70,6 @@ public class Emulator extends Application {
Emulator.frameskip = mPrefs.getInt(pref_frameskip, frameskip); Emulator.frameskip = mPrefs.getInt(pref_frameskip, frameskip);
Emulator.pvrrender = mPrefs.getBoolean(pref_pvrrender, pvrrender); Emulator.pvrrender = mPrefs.getBoolean(pref_pvrrender, pvrrender);
Emulator.syncedrender = mPrefs.getBoolean(pref_syncedrender, syncedrender); Emulator.syncedrender = mPrefs.getBoolean(pref_syncedrender, syncedrender);
Emulator.queuerender = mPrefs.getBoolean(pref_queuerender, queuerender);
Emulator.modvols = mPrefs.getBoolean(pref_modvols, modvols); Emulator.modvols = mPrefs.getBoolean(pref_modvols, modvols);
Emulator.bootdisk = mPrefs.getString(pref_bootdisk, bootdisk); Emulator.bootdisk = mPrefs.getString(pref_bootdisk, bootdisk);
Emulator.usereios = mPrefs.getBoolean(pref_usereios, usereios); Emulator.usereios = mPrefs.getBoolean(pref_usereios, usereios);
@ -101,7 +98,6 @@ public class Emulator extends Application {
JNIdc.frameskip(Emulator.frameskip); JNIdc.frameskip(Emulator.frameskip);
JNIdc.pvrrender(Emulator.pvrrender ? 1 : 0); JNIdc.pvrrender(Emulator.pvrrender ? 1 : 0);
JNIdc.syncedrender(Emulator.syncedrender ? 1 : 0); JNIdc.syncedrender(Emulator.syncedrender ? 1 : 0);
JNIdc.queuerender(Emulator.queuerender ? 1 : 0);
JNIdc.modvols(Emulator.modvols ? 1 : 0); JNIdc.modvols(Emulator.modvols ? 1 : 0);
JNIdc.usereios(Emulator.usereios ? 1 : 0); JNIdc.usereios(Emulator.usereios ? 1 : 0);
JNIdc.bootdisk(Emulator.bootdisk); JNIdc.bootdisk(Emulator.bootdisk);
@ -117,7 +113,6 @@ public class Emulator extends Application {
JNIdc.frameskip(mPrefs.getInt(pref_frameskip, frameskip)); JNIdc.frameskip(mPrefs.getInt(pref_frameskip, frameskip));
JNIdc.pvrrender(mPrefs.getBoolean(pref_pvrrender, pvrrender) ? 1 : 0); JNIdc.pvrrender(mPrefs.getBoolean(pref_pvrrender, pvrrender) ? 1 : 0);
JNIdc.syncedrender(mPrefs.getBoolean(pref_syncedrender, syncedrender) ? 1 : 0); JNIdc.syncedrender(mPrefs.getBoolean(pref_syncedrender, syncedrender) ? 1 : 0);
JNIdc.queuerender(mPrefs.getBoolean(pref_queuerender, queuerender) ? 1 : 0);
JNIdc.modvols(mPrefs.getBoolean(pref_modvols, modvols) ? 1 : 0); JNIdc.modvols(mPrefs.getBoolean(pref_modvols, modvols) ? 1 : 0);
} }

9
shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
View File

@ -455,15 +455,6 @@ public class OptionsFragment extends Fragment {
synced_render.setChecked(mPrefs.getBoolean(Emulator.pref_syncedrender, Emulator.syncedrender)); synced_render.setChecked(mPrefs.getBoolean(Emulator.pref_syncedrender, Emulator.syncedrender));
synced_render.setOnCheckedChangeListener(synchronous); synced_render.setOnCheckedChangeListener(synchronous);
OnCheckedChangeListener queued = new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mPrefs.edit().putBoolean(Emulator.pref_queuerender, isChecked).apply();
}
};
CompoundButton queue_render = (CompoundButton) getView().findViewById(R.id.queuerender_option);
queue_render.setChecked(mPrefs.getBoolean(Emulator.pref_queuerender, Emulator.queuerender));
queue_render.setOnCheckedChangeListener(queued);
OnCheckedChangeListener mod_volumes = new OnCheckedChangeListener() { OnCheckedChangeListener mod_volumes = new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

5
shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/PGConfigFragment.java
View File

@ -59,7 +59,6 @@ public class PGConfigFragment extends Fragment {
private SeekBar frameSeek; private SeekBar frameSeek;
private CompoundButton pvr_render; private CompoundButton pvr_render;
private CompoundButton synced_render; private CompoundButton synced_render;
private CompoundButton queue_render;
private CompoundButton modifier_volumes; private CompoundButton modifier_volumes;
private CompoundButton interrupt_opt; private CompoundButton interrupt_opt;
@ -99,7 +98,6 @@ public class PGConfigFragment extends Fragment {
frameSeek = (SeekBar) getView().findViewById(R.id.frame_seekbar); frameSeek = (SeekBar) getView().findViewById(R.id.frame_seekbar);
pvr_render = (CompoundButton) getView().findViewById(R.id.render_option); pvr_render = (CompoundButton) getView().findViewById(R.id.render_option);
synced_render = (CompoundButton) getView().findViewById(R.id.syncrender_option); synced_render = (CompoundButton) getView().findViewById(R.id.syncrender_option);
queue_render = (CompoundButton) getView().findViewById(R.id.queuerender_option);
modifier_volumes = (CompoundButton) getView().findViewById(R.id.modvols_option); modifier_volumes = (CompoundButton) getView().findViewById(R.id.modvols_option);
interrupt_opt = (CompoundButton) getView().findViewById(R.id.interrupt_option); interrupt_opt = (CompoundButton) getView().findViewById(R.id.interrupt_option);
} }
@ -113,7 +111,6 @@ public class PGConfigFragment extends Fragment {
.putInt(Emulator.pref_frameskip, frameSeek.getProgress()) .putInt(Emulator.pref_frameskip, frameSeek.getProgress())
.putBoolean(Emulator.pref_pvrrender, pvr_render.isChecked()) .putBoolean(Emulator.pref_pvrrender, pvr_render.isChecked())
.putBoolean(Emulator.pref_syncedrender, synced_render.isChecked()) .putBoolean(Emulator.pref_syncedrender, synced_render.isChecked())
.putBoolean(Emulator.pref_queuerender, queue_render.isChecked())
.putBoolean(Emulator.pref_modvols, modifier_volumes.isChecked()) .putBoolean(Emulator.pref_modvols, modifier_volumes.isChecked())
.putBoolean(Emulator.pref_interrupt, interrupt_opt.isChecked()).apply(); .putBoolean(Emulator.pref_interrupt, interrupt_opt.isChecked()).apply();
showToastMessage(getActivity().getString(R.string.pgconfig_saved), Snackbar.LENGTH_SHORT); showToastMessage(getActivity().getString(R.string.pgconfig_saved), Snackbar.LENGTH_SHORT);
@ -128,7 +125,6 @@ public class PGConfigFragment extends Fragment {
.remove(Emulator.pref_frameskip) .remove(Emulator.pref_frameskip)
.remove(Emulator.pref_pvrrender) .remove(Emulator.pref_pvrrender)
.remove(Emulator.pref_syncedrender) .remove(Emulator.pref_syncedrender)
.remove(Emulator.pref_queuerender)
.remove(Emulator.pref_modvols) .remove(Emulator.pref_modvols)
.remove(Emulator.pref_interrupt).apply(); .remove(Emulator.pref_interrupt).apply();
showToastMessage(getActivity().getString(R.string.pgconfig_cleared), Snackbar.LENGTH_SHORT); showToastMessage(getActivity().getString(R.string.pgconfig_cleared), Snackbar.LENGTH_SHORT);
@ -180,7 +176,6 @@ public class PGConfigFragment extends Fragment {
pvr_render.setChecked(mPrefs.getBoolean(Emulator.pref_pvrrender, Emulator.pvrrender)); pvr_render.setChecked(mPrefs.getBoolean(Emulator.pref_pvrrender, Emulator.pvrrender));
synced_render.setChecked(mPrefs.getBoolean(Emulator.pref_syncedrender, Emulator.syncedrender)); synced_render.setChecked(mPrefs.getBoolean(Emulator.pref_syncedrender, Emulator.syncedrender));
queue_render.setChecked(mPrefs.getBoolean(Emulator.pref_queuerender, Emulator.queuerender));
modifier_volumes.setChecked(mPrefs.getBoolean(Emulator.pref_modvols, Emulator.modvols)); modifier_volumes.setChecked(mPrefs.getBoolean(Emulator.pref_modvols, Emulator.modvols));
interrupt_opt.setChecked(mPrefs.getBoolean(Emulator.pref_interrupt, Emulator.interrupt)); interrupt_opt.setChecked(mPrefs.getBoolean(Emulator.pref_interrupt, Emulator.interrupt));

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

@ -46,7 +46,6 @@ public final class JNIdc
public static native void frameskip(int frames); public static native void frameskip(int frames);
public static native void pvrrender(int render); public static native void pvrrender(int render);
public static native void syncedrender(int sync); public static native void syncedrender(int sync);
public static native void queuerender(int queue);
public static native void modvols(int volumes); public static native void modvols(int volumes);
public static native void bootdisk(String disk); public static native void bootdisk(String disk);
public static native void usereios(int reios); public static native void usereios(int reios);

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

@ -61,7 +61,6 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_subdivide(JNIEnv *env
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_frameskip(JNIEnv *env,jobject obj, jint frames) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_frameskip(JNIEnv *env,jobject obj, jint frames) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_pvrrender(JNIEnv *env,jobject obj, jint render) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_pvrrender(JNIEnv *env,jobject obj, jint render) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_syncedrender(JNIEnv *env,jobject obj, jint sync) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_syncedrender(JNIEnv *env,jobject obj, jint sync) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_queuerender(JNIEnv *env,jobject obj, jint queue) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_modvols(JNIEnv *env,jobject obj, jint volumes) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_modvols(JNIEnv *env,jobject obj, jint volumes) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_bootdisk(JNIEnv *env,jobject obj, jstring disk) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_bootdisk(JNIEnv *env,jobject obj, jstring disk) __attribute__((visibility("default")));
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_usereios(JNIEnv *env,jobject obj, jint reios) __attribute__((visibility("default"))); JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_usereios(JNIEnv *env,jobject obj, jint reios) __attribute__((visibility("default")));
@ -153,11 +152,6 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_syncedrender(JNIEnv *
settings.pvr.SynchronousRender = sync; settings.pvr.SynchronousRender = sync;
} }
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_queuerender(JNIEnv *env,jobject obj, jint queue)
{
settings.pvr.QueueRender = queue;
}
JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_modvols(JNIEnv *env,jobject obj, jint volumes) JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_modvols(JNIEnv *env,jobject obj, jint volumes)
{ {

28
shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml
View File

@ -747,34 +747,6 @@
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
<TableRow
android:layout_marginTop="10dp"
android:gravity="center_vertical" >
<TextView
android:id="@+id/queuerender_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:ems="10"
android:gravity="center_vertical|left"
android:text="@string/select_queuerender" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical" >
<Switch
android:id="@+id/queuerender_option"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true" />
</LinearLayout>
</TableRow>
<TableRow <TableRow
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:gravity="center_vertical" > android:gravity="center_vertical" >

28
shell/android-studio/reicast/src/main/res/layout-v14/pgconfig_fragment.xml
View File

@ -282,34 +282,6 @@
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
<TableRow
android:layout_marginTop="10dp"
android:gravity="center_vertical" >
<TextView
android:id="@+id/queuerender_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:ems="10"
android:gravity="center_vertical|left"
android:text="@string/select_queuerender" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical" >
<Switch
android:id="@+id/queuerender_option"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true" />
</LinearLayout>
</TableRow>
<TableRow <TableRow
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:gravity="center_vertical" > android:gravity="center_vertical" >

28
shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml
View File

@ -747,34 +747,6 @@
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
<TableRow
android:layout_marginTop="10dp"
android:gravity="center_vertical" >
<TextView
android:id="@+id/queuerender_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:ems="10"
android:gravity="center_vertical|left"
android:text="@string/select_queuerender" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical" >
<Checkbox
android:id="@+id/queuerender_option"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true" />
</LinearLayout>
</TableRow>
<TableRow <TableRow
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:gravity="center_vertical" > android:gravity="center_vertical" >

28
shell/android-studio/reicast/src/main/res/layout/pgconfig_fragment.xml
View File

@ -282,34 +282,6 @@
</LinearLayout> </LinearLayout>
</TableRow> </TableRow>
<TableRow
android:layout_marginTop="10dp"
android:gravity="center_vertical" >
<TextView
android:id="@+id/queuerender_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:ems="10"
android:gravity="center_vertical|left"
android:text="@string/select_queuerender" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical" >
<Checkbox
android:id="@+id/queuerender_option"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true" />
</LinearLayout>
</TableRow>
<TableRow <TableRow
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:gravity="center_vertical" > android:gravity="center_vertical" >

1
shell/android-studio/reicast/src/main/res/values/strings.xml
View File

@ -48,7 +48,6 @@
<string name="set_frameskip">Frameskip Value</string> <string name="set_frameskip">Frameskip Value</string>
<string name="select_render">PVR Rendering (does nothing for now)</string> <string name="select_render">PVR Rendering (does nothing for now)</string>
<string name="select_syncrender">Synchronous Rendering</string> <string name="select_syncrender">Synchronous Rendering</string>
<string name="select_queuerender">Force Queue Rendering</string>
<string name="select_modvols">Enable Modifier Volumes</string> <string name="select_modvols">Enable Modifier Volumes</string>
<string name="select_interrupt">Enable Delay Interrupt</string> <string name="select_interrupt">Enable Delay Interrupt</string>
<string name="select_fps">Show On-Screen FPS</string> <string name="select_fps">Show On-Screen FPS</string>