Ported2

Common/CPUDetect.h

@@ -149,17 +149,17 @@ struct CPUInfo {
 	} sQuirks;
 
 	// Call Detect()
-	explicit CPUInfo();
+	explicit CPUInfo(){};
 
 	// Turn the cpu info into a string we can show
-	std::vector<std::string> Features();
-	std::string Summarize();
+	std::vector<std::string> Features() { return {}; };
+	std::string Summarize() { return ""; } ;
 
 private:
 	// Detects the various cpu features
 	void Detect();
 };
 
-extern CPUInfo cpu_info;
+static CPUInfo cpu_info;
 
-const char *GetCompilerABI();
+inline const char *GetCompilerABI() { return ""; }

Common/Data/Format/ZIMLoad.cpp

@@ -124,9 +124,29 @@ int LoadZIMPtr(const uint8_t *zim, size_t datasize, int *width, int *height, int
 	return num_levels;
 }
 
+extern std::string _atlasFontZimFileData;
+extern std::string _ppgeAtlasFontZimFileData;
 int LoadZIM(const char *filename, int *width, int *height, int *format, uint8_t **image) {
 	size_t size;
 	uint8_t *buffer = g_VFS.ReadFile(filename, &size);
+	bool deleteBuffer = true;
+
+	// If couldn't find the file natively, check the pre-loaded file data
+	if (!buffer && std::string(filename).find("ppge_atlas.zim") != std::string::npos)
+	{
+		size = _ppgeAtlasFontZimFileData.size();
+		buffer = (uint8_t*)_ppgeAtlasFontZimFileData.data();
+		deleteBuffer = false;
+	} 
+
+	// If couldn't find the file natively, check the pre-loaded file data
+	if (!buffer && std::string(filename).find("font_atlas.zim") != std::string::npos)
+	{
+		size = _atlasFontZimFileData.size();
+		buffer = (uint8_t*)_atlasFontZimFileData.data();
+		deleteBuffer = false;
+	} 
+
 	if (!buffer) {
 		ERROR_LOG(Log::IO, "Couldn't read data for '%s'", filename);
 		return 0;
@@ -136,6 +156,6 @@ int LoadZIM(const char *filename, int *width, int *height, int *format, uint8_t
 	if (!retval) {
 		ERROR_LOG(Log::IO, "Not a valid ZIM file: %s (size: %lld bytes)", filename, (long long)size);
 	}
-	delete [] buffer;
+	if (deleteBuffer) delete [] buffer; 
 	return retval;
 }

Common/GPU/OpenGL/GLFeatures.h

@@ -135,7 +135,7 @@ struct GLExtensions {
 	int GLSLVersion();
 };
 
-extern GLExtensions gl_extensions;
+static GLExtensions gl_extensions;
 
 // Call this after filling out vendor etc to lookup the bugs etc.
 // Only needs to be called once. Currently called by CheckGLExtensions().
@@ -150,4 +150,4 @@ bool CheckGLExtensions();
 void SetGLCoreContext(bool flag);
 void ResetGLExtensions();
 
-std::string ApplyGLSLPrelude(const std::string &source, uint32_t stage);
+std::string ApplyGLSLPrelude(const std::string &source, uint32_t stage);

Common/Log/LogManager.cpp

@@ -117,6 +117,7 @@ const char *LogManager::GetLogTypeName(Log type) {
 void PrintfLog(const LogMessage &message);
 
 void LogManager::Init(bool *enabledSetting, bool headless) {
+	return;
 	g_bLogEnabledSetting = enabledSetting;
 	if (initialized_) {
 		// Just update the pointer, already done above.
@@ -134,6 +135,7 @@ void LogManager::Init(bool *enabledSetting, bool headless) {
 }
 
 void LogManager::Shutdown() {
+	return;
 	if (!initialized_) {
 		// already done
 		return;
@@ -160,6 +162,7 @@ void LogManager::Shutdown() {
 }
 
 LogManager::LogManager() {
+	return;
 #if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(UWP) || PPSSPP_PLATFORM(SWITCH)
 	stdioUseColor_ = false;
 #elif defined(_MSC_VER)
@@ -185,6 +188,7 @@ LogManager::LogManager() {
 }
 
 LogManager::~LogManager() {
+	return;
 	Shutdown();
 
 #if PPSSPP_PLATFORM(WINDOWS) && !PPSSPP_PLATFORM(UWP)
@@ -194,6 +198,7 @@ LogManager::~LogManager() {
 }
 
 void LogManager::ChangeFileLog(const Path &filename) {
+	return;
 	if (fp_ && filename == logFilename_) {
 		// All good
 		return;
@@ -214,13 +219,15 @@ void LogManager::ChangeFileLog(const Path &filename) {
 }
 
 void LogManager::SaveConfig(Section *section) {
+	return;
 	for (int i = 0; i < (int)Log::NUMBER_OF_LOGS; i++) {
 		section->Set((std::string(g_logTypeNames[i]) + "Enabled"), g_log[i].enabled);
 		section->Set((std::string(g_logTypeNames[i]) + "Level"), (int)g_log[i].level);
 	}
 }
 
 void LogManager::LoadConfig(const Section *section, bool debugDefaults) {
+	return;
 	for (int i = 0; i < (int)Log::NUMBER_OF_LOGS; i++) {
 		bool enabled = false;
 		int level = 0;
@@ -232,13 +239,15 @@ void LogManager::LoadConfig(const Section *section, bool debugDefaults) {
 }
 
 void LogManager::SetOutputsEnabled(LogOutput outputs) {
+	return;
 	outputs_ = outputs; 
 	if (outputs & LogOutput::File) {
 		ChangeFileLog(logFilename_);
 	}
 }
 
 void LogManager::LogLine(LogLevel level, Log type, const char *file, int line, const char *format, va_list args) {
+	return;
 	char msgBuf[1024];
 
 	const LogChannel &log = g_log[(size_t)type];

Common/Log/LogManager.h

@@ -111,6 +111,7 @@ class LogManager {
 	}
 
 	void SetAllLogLevels(LogLevel level) {
+		return;
 		for (int i = 0; i < (int)Log::NUMBER_OF_LOGS; ++i) {
 			g_log[i].level = level;
 		}

Common/Render/Text/draw_text_sdl.cpp

@@ -15,8 +15,8 @@
 
 #if defined(USE_SDL2_TTF)
 
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_ttf.h"
+#include "SDL.h"
+#include "SDL_ttf.h"
 
 static std::string getlocale() {
 	// setlocale is not an intuitive function...
@@ -245,6 +245,7 @@ int TextDrawerSDL::FindFallbackFonts(uint32_t missingGlyph, int ptSize) {
 	return -1;
 }
 
+extern std::string _ppgeFontFileData;
 uint32_t TextDrawerSDL::SetFont(const char *fontName, int size, int flags) {
 	uint32_t fontHash = fontName && strlen(fontName) ? hash::Adler32((const uint8_t *)fontName, strlen(fontName)) : 0;
 	fontHash ^= size;
@@ -256,10 +257,21 @@ uint32_t TextDrawerSDL::SetFont(const char *fontName, int size, int flags) {
 		return fontHash;
 	}
 
-	const char *useFont = fontName ? fontName : "Roboto-Condensed.ttf";
+	const char *useFont = std::string(fontName) != "" ? fontName : "Roboto-Condensed.ttf";
 	const int ptSize = (int)((size + 6) / dpiScale_);
+	TTF_Font *font = nullptr;
 
-	TTF_Font *font = TTF_OpenFont(useFont, ptSize);
+	// If it's the default font, take it from memory 
+	if (_ppgeFontFileData != "")
+	{
+		SDL_RWops *rw = SDL_RWFromConstMem(_ppgeFontFileData.data(),  _ppgeFontFileData.size());
+		if ( rw != NULL ) font = TTF_OpenFontRW(rw, 0, ptSize);
+	}
+	else // otherwise from a file
+	{
+		font = TTF_OpenFont(useFont, ptSize);
+	}
+
 
 	if (!font) {
 		File::FileInfo fileInfo;

Common/Render/Text/draw_text_sdl.h

@@ -7,8 +7,8 @@
 
 #if defined(USE_SDL2_TTF)
 
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_ttf.h"
+#include "SDL.h"
+#include "SDL_ttf.h"
 
 #if defined(USE_SDL2_TTF_FONTCONFIG)
 #include <fontconfig/fontconfig.h>

Common/Thread/ThreadManager.cpp

@@ -60,6 +60,7 @@ ThreadManager::~ThreadManager() {
 }
 
 void ThreadManager::Teardown() {
+	return;
 	for (TaskThreadContext *&threadCtx : global_->threads_) {
 		std::unique_lock<std::mutex> lock(threadCtx->mutex);
 		threadCtx->cancelled = true;
@@ -106,6 +107,7 @@ void ThreadManager::Teardown() {
 }
 
 bool ThreadManager::TeardownTask(Task *task, bool enqueue) {
+	return true;
 	if (!task)
 		return true;
 
@@ -131,6 +133,7 @@ bool ThreadManager::TeardownTask(Task *task, bool enqueue) {
 }
 
 static void WorkerThreadFunc(GlobalThreadContext *global, TaskThreadContext *thread) {
+	return;
 	if (thread->type == TaskType::CPU_COMPUTE) {
 		snprintf(thread->name, sizeof(thread->name), "PoolW %d", thread->index);
 	} else {
@@ -216,6 +219,7 @@ static void WorkerThreadFunc(GlobalThreadContext *global, TaskThreadContext *thr
 }
 
 void ThreadManager::Init(int numRealCores, int numLogicalCoresPerCpu) {
+	return;
 	if (IsInitialized()) {
 		Teardown();
 	}
@@ -238,6 +242,9 @@ void ThreadManager::Init(int numRealCores, int numLogicalCoresPerCpu) {
 }
 
 void ThreadManager::EnqueueTask(Task *task) {
+	task->Run();
+	task->Release();
+	return;
 	if (task->Type() == TaskType::DEDICATED_THREAD) {
 		std::thread th([=](Task *task) {
 			SetCurrentThreadName("DedicatedThreadTask");
@@ -302,6 +309,9 @@ void ThreadManager::EnqueueTask(Task *task) {
 }
 
 void ThreadManager::EnqueueTaskOnThread(int threadNum, Task *task) {
+	task->Run();
+	task->Release();
+	return;
 	_assert_msg_(task->Type() != TaskType::DEDICATED_THREAD, "Dedicated thread tasks can't be put on specific threads");
 
 	_assert_msg_(threadNum >= 0 && threadNum < (int)global_->threads_.size(), "Bad threadnum or not initialized");
@@ -316,6 +326,7 @@ void ThreadManager::EnqueueTaskOnThread(int threadNum, Task *task) {
 }
 
 int ThreadManager::GetNumLooperThreads() const {
+	return 1;
 	return numComputeThreads_;
 }
 
@@ -324,5 +335,6 @@ void ThreadManager::TryCancelTask(uint64_t taskID) {
 }
 
 bool ThreadManager::IsInitialized() const {
+	return true;
 	return !global_->threads_.empty();
-}
+}

Common/VR/OpenXRLoader.h

@@ -20,7 +20,7 @@
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
 #if defined(_M_IX86) || defined(_M_X64)
 #include "Common/GPU/OpenGL/GLCommon.h"
-#define XR_USE_GRAPHICS_API_OPENGL 1
+//#define XR_USE_GRAPHICS_API_OPENGL 1
 #endif
 #define XR_USE_PLATFORM_WIN32 1
 #endif

Core/Compatibility.cpp

@@ -27,6 +27,10 @@
 #include "Core/Config.h"
 #include "Core/System.h"
 
+#include <sstream>
+extern std::string _compatibilityFileData;
+extern std::string _compatibilityVRFileData;
+
 void Compatibility::Load(const std::string &gameID) {
 	Clear();
 
@@ -38,10 +42,13 @@ void Compatibility::Load(const std::string &gameID) {
 	if (ignored_.find("ALL") != ignored_.end())
 		return;
 
+	std::istringstream compatIString (_compatibilityFileData);
+	std::istringstream compatVRIString (_compatibilityVRFileData);
+
 	{
 		IniFile compat;
 		// This loads from assets.
-		if (compat.LoadFromVFS(g_VFS, "compat.ini")) {
+		if (compat.Load(compatIString)) {
 			CheckSettings(compat, gameID);
 		} else {
 			auto e = GetI18NCategory(I18NCat::ERRORS);
@@ -62,7 +69,7 @@ void Compatibility::Load(const std::string &gameID) {
 	{
 		IniFile compat;
 		// This loads from assets.
-		if (compat.LoadFromVFS(g_VFS, "compatvr.ini")) {
+		if (compat.Load(compatVRIString)) {
 			CheckVRSettings(compat, gameID);
 		}
 	}

Core/Config.cpp

@@ -60,6 +60,9 @@
 
 #include "GPU/Common/FramebufferManagerCommon.h"
 
+const char *PPSSPP_GIT_VERSION = "unknown";
+inline bool VulkanMayBeAvailable() { return false; }
+
 // TODO: Find a better place for this.
 http::RequestManager g_DownloadManager;
 

Core/Dialog/PSPSaveDialog.cpp

@@ -1206,6 +1206,7 @@ void PSPSaveDialog::ExecuteNotVisibleIOAction() {
 }
 
 void PSPSaveDialog::JoinIOThread() {
+	return; // Disabling multithreading
 	if (ioThread) {
 		ioThread->join();
 		delete ioThread;
@@ -1221,6 +1222,8 @@ static void DoExecuteIOAction(PSPSaveDialog *dialog) {
 }
 
 void PSPSaveDialog::StartIOThread() {
+	ExecuteIOAction(); // Exeute the action directly
+	return; // Disabling multithreading
 	if (ioThread) {
 		WARN_LOG_REPORT(Log::sceUtility, "Starting a save io thread when one already pending, uh oh.");
 		JoinIOThread();

Core/FileLoaders/CachingFileLoader.cpp

@@ -266,6 +266,8 @@ void CachingFileLoader::StartReadAhead(s64 pos) {
 	aheadThreadRunning_ = true;
 	if (aheadThread_.joinable())
 		aheadThread_.join();
+
+	fprintf(stderr, "Unexpected thread creation found in CachingFileLoader.cpp\n"); std::abort();
 	aheadThread_ = std::thread([this, pos] {
 		SetCurrentThreadName("FileLoaderReadAhead");