refactor

Author: SSimco

src/Cafe/CMakeLists.txt

@@ -83,7 +83,6 @@ add_library(CemuCafe
   HW/Espresso/Recompiler/PPCRecompilerImlGenFPU.cpp
   HW/Espresso/Recompiler/PPCRecompilerIml.h
   HW/Espresso/Recompiler/PPCRecompilerIntermediate.cpp
-  HW/Espresso/Recompiler/RecompilerTests.cpp
   HW/Latte/Common/RegisterSerializer.cpp
   HW/Latte/Common/RegisterSerializer.h
   HW/Latte/Common/ShaderSerializer.cpp

src/Cafe/HW/Espresso/Recompiler/BackendAArch64/BackendAArch64.cpp

@@ -68,6 +68,7 @@ class AArch64Allocator : public Allocator
 #else
 	inline static Allocator s_allocator;
 #endif
+	inline static std::mutex s_allocatorMutex;
 	Allocator* m_allocatorImpl;
 	bool m_freeDisabled = false;
 
@@ -77,6 +78,7 @@ class AArch64Allocator : public Allocator
 
 	uint32* alloc(size_t size) override
 	{
+		std::lock_guard lock{s_allocatorMutex};
 		return m_allocatorImpl->alloc(size);
 	}
 
@@ -87,8 +89,11 @@ class AArch64Allocator : public Allocator
 
 	void free(uint32* p) override
 	{
-		if (!m_freeDisabled)
-			m_allocatorImpl->free(p);
+		if (m_freeDisabled)
+			return;
+
+		std::lock_guard lock{s_allocatorMutex};
+		m_allocatorImpl->free(p);
 	}
 
 	[[nodiscard]] bool useProtect() const override

src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp

@@ -2097,10 +2097,10 @@ void VulkanRenderer::SubmitCommandBuffer(VkSemaphore signalSemaphore, VkSemaphor
 	const VkPipelineStageFlags semWaitStageMask[2] = { VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT };
 	VkSemaphore waitSemArray[2];
 	submitInfo.waitSemaphoreCount = 0;
-	if (m_numSubmittedCmdBuffers > 0)
-		waitSemArray[submitInfo.waitSemaphoreCount++] = prevSem; // wait on semaphore from previous submit
 	if (waitSemaphore != VK_NULL_HANDLE)
 		waitSemArray[submitInfo.waitSemaphoreCount++] = waitSemaphore;
+	if (m_numSubmittedCmdBuffers > 0)
+		waitSemArray[submitInfo.waitSemaphoreCount++] = prevSem; // wait on semaphore from previous submit
 	submitInfo.pWaitDstStageMask = semWaitStageMask;
 	submitInfo.pWaitSemaphores = waitSemArray;
 

src/Common/version.h

@@ -7,7 +7,7 @@
 #define _XSTRINGFY(s) _STRINGFY(s)
 #define _STRINGFY(s) #s
 
-#if EMULATOR_VERSION_MAJOR != 0
+#if EMULATOR_VERSION_MAJOR != 0 || EMULATOR_VERSION_MINOR != 0
 #define BUILD_VERSION_WITH_NAME_STRING (EMULATOR_NAME " " _XSTRINGFY(EMULATOR_VERSION_MAJOR) "." _XSTRINGFY(EMULATOR_VERSION_MINOR) EMULATOR_VERSION_SUFFIX)
 #define BUILD_VERSION_STRING (_XSTRINGFY(EMULATOR_VERSION_MAJOR) "." _XSTRINGFY(EMULATOR_VERSION_MINOR) EMULATOR_VERSION_SUFFIX)
 #else

src/android/app/build.gradle.kts

@@ -90,7 +90,7 @@ android {
         debug {
             applicationIdSuffix = ".debug"
         }
-        create("githubRelease") {
+        create("github") {
             if (keystoreFilePath != null) {
                 initWith(getByName("release"))
                 isMinifyEnabled = true
@@ -177,16 +177,16 @@ abstract class ComputeCemuDataFilesHashTask : DefaultTask() {
             assetDir.mkdirs()
         }
 
-        val cemuDataFilesFile = File(project.projectDir, cemuDataFolder.get())
+        val cemuDataFilesDir = File(project.projectDir, cemuDataFolder.get())
         val hashFile = File(assetDir, "hash.txt")
         val md = MessageDigest.getInstance("SHA-256")
 
-        if (!cemuDataFilesFile.isDirectory) {
+        if (!cemuDataFilesDir.isDirectory) {
             hashFile.writeText("invalid")
             return
         }
 
-        val fileHashes = cemuDataFilesFile.walkTopDown()
+        val fileHashes = cemuDataFilesDir.walkTopDown()
             .filter { it.isFile && !isFileIgnored(it) }
             .sortedBy { it.path }
             .map {
@@ -204,10 +204,10 @@ abstract class ComputeCemuDataFilesHashTask : DefaultTask() {
     }
 }
 
-tasks.register<ComputeCemuDataFilesHashTask>("computeCemuDataFilesHash") {
+val computeCemuDataFilesHashTask =tasks.register<ComputeCemuDataFilesHashTask>("computeCemuDataFilesHash") {
     cemuDataFolder = cemuDataFilesFolder
 }
-tasks.preBuild.dependsOn("computeCemuDataFilesHash")
+tasks.preBuild.dependsOn(computeCemuDataFilesHashTask)
 
 dependencies {
     implementation(libs.androidx.lifecycle.runtime.ktx)

src/android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application tools:remove="android:icon,android:roundIcon" />
+</manifest>

src/android/app/src/main/cpp/JNIUtils.cpp

@@ -87,11 +87,3 @@ jobject JNIUtils::createJavaStringArrayList(JNIEnv* env, const std::vector<std::
 	}
 	return arrayListObject;
 }
-
-void JNIUtils::fiberSafeJNICall(const std::function<void(JNIEnv*)>& func)
-{
-	std::thread([&]() {
-		ScopedJNIENV env;
-		func(*env);
-	}).join();
-}

src/android/app/src/main/cpp/JNIUtils.h

@@ -191,5 +191,11 @@ namespace JNIUtils
 		return obj;
 	}
 
-	void fiberSafeJNICall(const std::function<void(JNIEnv*)>& func);
+	inline void fiberSafeJNICall(const std::function<void(JNIEnv*)>& func)
+	{
+		std::thread([&]() {
+			ScopedJNIENV env;
+			func(*env);
+		}).join();
+	}
 } // namespace JNIUtils

src/android/app/src/main/cpp/NativeSettings.cpp

@@ -348,7 +348,6 @@ Java_info_cemu_cemu_nativeinterface_NativeSettings_getCustomDriverPath(JNIEnv* e
 extern "C" [[maybe_unused]] JNIEXPORT void JNICALL
 Java_info_cemu_cemu_nativeinterface_NativeSettings_setCustomDriverPath(JNIEnv* env, [[maybe_unused]] jclass clazz, jstring custom_driver_path)
 {
-	throw std::runtime_error("todo");
 	g_config.data().custom_driver_path = JNIUtils::toString(env, custom_driver_path);
 }
 

src/android/app/src/main/cpp/WuaConverter.cpp

@@ -21,15 +21,7 @@ void WuaConverter::startConversion(int fd, std::unique_ptr<CompressTitleCallback
 		  callbacks->onError();
 		  return;
 	  }
-
-	  struct ScopedFd
-	  {
-		  int fd;
-		  ~ScopedFd()
-		  {
-			  close(fd);
-		  }
-	  } scopedFd{.fd = fd};
+	  stdx::scope_exit fdCleanup([fd](){ close(fd); });
 
 	  if (m_started)
 		  return;