mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 03:14:34 +01:00
Merge branch 'master' into TemporaryHackishBranch
# Conflicts: # Core/Config.cpp # Core/Config.h # Core/KeyMap.cpp # Core/SaveState.cpp # UI/GameSettingsScreen.cpp # assets/compat.ini
This commit is contained in:
commit
072e1522b3
321 files changed
+53762
-2959
No files matched your search
+27
-8
@@ -16,6 +16,7 @@
|
||||
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstring>
|
||||
|
||||
#include "ppsspp_config.h"
|
||||
|
||||
@@ -23,6 +24,7 @@
|
||||
#include "Common/System/NativeApp.h"
|
||||
#include "Common/System/System.h"
|
||||
#include "Common/GPU/OpenGL/GLFeatures.h"
|
||||
#include "Common/File/AndroidStorage.h"
|
||||
#include "Common/Data/Text/I18n.h"
|
||||
#include "Common/Net/HTTPClient.h"
|
||||
#include "Common/UI/Context.h"
|
||||
@@ -59,12 +61,8 @@
|
||||
int GetD3DCompilerVersion();
|
||||
#endif
|
||||
|
||||
#if PPSSPP_PLATFORM(ANDROID)
|
||||
|
||||
#include "android/jni/app-android.h"
|
||||
|
||||
#endif
|
||||
|
||||
static const char *logLevelList[] = {
|
||||
"Notice",
|
||||
"Error",
|
||||
@@ -423,6 +421,18 @@ const char *GetCompilerABI() {
|
||||
return "x86";
|
||||
#elif PPSSPP_ARCH(AMD64)
|
||||
return "x86-64";
|
||||
#elif PPSSPP_ARCH(RISCV64)
|
||||
//https://github.com/riscv/riscv-toolchain-conventions#cc-preprocessor-definitions
|
||||
//https://github.com/riscv/riscv-c-api-doc/blob/master/riscv-c-api.md#abi-related-preprocessor-definitions
|
||||
#if defined(__riscv_float_abi_single)
|
||||
return "lp64f";
|
||||
#elif defined(__riscv_float_abi_double)
|
||||
return "lp64d";
|
||||
#elif defined(__riscv_float_abi_quad)
|
||||
return "lp64q";
|
||||
#elif defined(__riscv_float_abi_soft)
|
||||
return "lp64";
|
||||
#endif
|
||||
#else
|
||||
return "other";
|
||||
#endif
|
||||
@@ -471,7 +481,12 @@ void SystemInfoScreen::CreateViews() {
|
||||
#endif
|
||||
|
||||
deviceSpecs->Add(new ItemHeader(si->T("CPU Information")));
|
||||
deviceSpecs->Add(new InfoItem(si->T("CPU Name", "Name"), cpu_info.brand_string));
|
||||
|
||||
// Don't bother showing the CPU name if we don't have one.
|
||||
if (strcmp(cpu_info.brand_string, "Unknown") != 0) {
|
||||
deviceSpecs->Add(new InfoItem(si->T("CPU Name", "Name"), cpu_info.brand_string));
|
||||
}
|
||||
|
||||
int totalThreads = cpu_info.num_cores * cpu_info.logical_cpu_count;
|
||||
std::string cores = StringFromFormat(si->T("%d (%d per core, %d cores)"), totalThreads, cpu_info.logical_cpu_count, cpu_info.num_cores);
|
||||
deviceSpecs->Add(new InfoItem(si->T("Threads"), cores));
|
||||
@@ -592,8 +607,11 @@ void SystemInfoScreen::CreateViews() {
|
||||
|
||||
#if PPSSPP_PLATFORM(ANDROID)
|
||||
storage->Add(new InfoItem("ExtFilesDir", g_extFilesDir));
|
||||
if (System_GetPropertyBool(SYSPROP_ANDROID_SCOPED_STORAGE)) {
|
||||
storage->Add(new InfoItem("Scoped Storage", di->T("Yes")));
|
||||
bool scoped = System_GetPropertyBool(SYSPROP_ANDROID_SCOPED_STORAGE);
|
||||
storage->Add(new InfoItem("Scoped Storage Enabled", scoped ? di->T("Yes") : di->T("No")));
|
||||
if (System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 30) {
|
||||
// This flag is only relevant on Android API 30+.
|
||||
storage->Add(new InfoItem("IsStoragePreservedLegacy", Android_IsExternalStoragePreservedLegacy() ? di->T("Yes") : di->T("No")));
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1188,7 +1206,8 @@ void FrameDumpTestScreen::update() {
|
||||
UIScreen::update();
|
||||
|
||||
if (!listing_) {
|
||||
listing_ = g_DownloadManager.StartDownload(framedumpsBaseUrl, Path());
|
||||
const char *acceptMime = "text/html, */*; q=0.8";
|
||||
listing_ = g_DownloadManager.StartDownload(framedumpsBaseUrl, Path(), acceptMime);
|
||||
}
|
||||
|
||||
if (listing_ && listing_->Done() && files_.empty()) {
|
||||
|
||||
Reference in new issue
Block a user