(Gradle/Android Studio) Update

(Default threaded video setting) Remove
g_defaults.settings.threaded_video - could help Switch and Android
This commit is contained in:
twinaphex 2019-07-10 12:21:18 +02:00
parent 8f19dd8b12
commit 212ff42ae0
6 changed files with 3 additions and 13 deletions

View File

@ -192,7 +192,7 @@
/* Threaded video. Will possibly increase performance significantly /* Threaded video. Will possibly increase performance significantly
* at the cost of worse synchronization and latency. * at the cost of worse synchronization and latency.
*/ */
#if defined(HAVE_LIBNX) #if defined(HAVE_LIBNX) || defined(ANDROID)
#define DEFAULT_VIDEO_THREADED true #define DEFAULT_VIDEO_THREADED true
#else #else
#define DEFAULT_VIDEO_THREADED false #define DEFAULT_VIDEO_THREADED false

View File

@ -2037,8 +2037,7 @@ void config_set_defaults(void)
#endif #endif
settings->floats.video_scale = DEFAULT_SCALE; settings->floats.video_scale = DEFAULT_SCALE;
if (g_defaults.settings.video_threaded_enable != DEFAULT_VIDEO_THREADED) video_driver_set_threaded(DEFAULT_VIDEO_THREADED);
video_driver_set_threaded(g_defaults.settings.video_threaded_enable);
settings->floats.video_msg_color_r = ((message_color >> 16) & 0xff) / 255.0f; settings->floats.video_msg_color_r = ((message_color >> 16) & 0xff) / 255.0f;
settings->floats.video_msg_color_g = ((message_color >> 8) & 0xff) / 255.0f; settings->floats.video_msg_color_g = ((message_color >> 8) & 0xff) / 255.0f;

View File

@ -102,7 +102,6 @@ struct defaults
{ {
int out_latency; int out_latency;
float video_refresh_rate; float video_refresh_rate;
bool video_threaded_enable;
char menu[32]; char menu[32];
} settings; } settings;

View File

@ -1664,15 +1664,9 @@ static void frontend_unix_get_env(int *argc,
frontend_android_get_name(device_model, sizeof(device_model)); frontend_android_get_name(device_model, sizeof(device_model));
system_property_get("getprop", "ro.product.id", device_id); system_property_get("getprop", "ro.product.id", device_id);
g_defaults.settings.video_threaded_enable = true;
/* Set automatic default values per device */ /* Set automatic default values per device */
if (device_is_xperia_play(device_model)) if (device_is_xperia_play(device_model))
{
g_defaults.settings.out_latency = 128; g_defaults.settings.out_latency = 128;
g_defaults.settings.video_refresh_rate = 59.19132938771038;
g_defaults.settings.video_threaded_enable = false;
}
else if (strstr(device_model, "GAMEMID_BT")) else if (strstr(device_model, "GAMEMID_BT"))
g_defaults.settings.out_latency = 160; g_defaults.settings.out_latency = 160;
else if (strstr(device_model, "SHIELD")) else if (strstr(device_model, "SHIELD"))

View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:3.4.1" classpath 'com.android.tools.build:gradle:3.4.2'
} }
} }

View File

@ -16572,9 +16572,7 @@ static void do_runahead(int runahead_count, bool use_secondary)
uint64_t frame_count = video_driver_frame_count; uint64_t frame_count = video_driver_frame_count;
if (runahead_count <= 0 || !runahead_available) if (runahead_count <= 0 || !runahead_available)
{
goto force_input_dirty; goto force_input_dirty;
}
if (!runahead_save_state_size_known) if (!runahead_save_state_size_known)
{ {