Upstream 2512 merge

Author: Motobug

.editorconfig

@@ -25,3 +25,9 @@ insert_final_newline = false
 indent_size = 4
 indent_style = space
 insert_final_newline = true
+
+[*.{kt,kts}]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+max_line_length = 100

.gitmodules

@@ -104,3 +104,28 @@
 [submodule "Externals/miniupnpc/miniupnp"]
 	path = Externals/miniupnpc/miniupnp
 	url = https://github.com/miniupnp/miniupnp.git
+	shallow = true
+[submodule "Externals/glslang/glslang"]
+	path = Externals/glslang/glslang
+	url = https://github.com/KhronosGroup/glslang.git
+	shallow = true
+[submodule "Externals/pugixml/pugixml"]
+	path = Externals/pugixml/pugixml
+	url = https://github.com/zeux/pugixml.git
+	shallow = true
+[submodule "Externals/cpp-ipc/cpp-ipc"]
+	path = Externals/cpp-ipc/cpp-ipc
+	url = https://github.com/mutouyun/cpp-ipc.git
+	shallow = true
+[submodule "Externals/cpp-optparse/cpp-optparse"]
+	path = Externals/cpp-optparse/cpp-optparse
+	url = https://github.com/weisslj/cpp-optparse.git
+	shallow = true
+[submodule "Externals/bzip2/bzip2"]
+	path = Externals/bzip2/bzip2
+	url = https://gitlab.com/bzip2/bzip2.git
+	shallow = true
+[submodule "Externals/imgui/imgui"]
+	path = Externals/imgui/imgui
+	url = https://github.com/ocornut/imgui.git
+	shallow = true

AndroidSetup.md

@@ -6,21 +6,29 @@ If you'd like to contribute to the Android project, but do not currently have a
 
 * [Android Studio](https://developer.android.com/studio/)
 
-If you downloaded Android Studio, install it with the default options and open the project located in `dolphin/Source/Android`
+Install Android Studio with the default options if you do not already have it.
 
 ## Setting Up Android Studio
 
-1. Wait for background tasks to complete on the bottom of the window.
-2. Launch the Android SDK Manager by clicking on its icon in Android Studio's main toolbar:
-![Android Studio Package Icon][package-icon]
-3. Install or update the SDK Platform. Choose the API level as defined in the app module's [build.gradle](Source/Android/app/build.gradle#L7) file.
-4. Install a CMake version as defined in the app module's [build.gradle](Source/Android/app/build.gradle#L99) file. The option won't appear until you select `Show Package Details`.
-5. Select `Build Variants` on the left side of the window to choose the build variant and ABI you would like to compile for the `:app` module.
-6. Select the green hammer icon in the main toolbar to build and create the apk in `Source/Android/app/build/outputs/apk`
+1. Open the `Source/Android` project in Android Studio, let any background tasks finish, and Android Studio will automatically download the required SDK components and tooling.
+2. Use the hammer icon or **Build > Assemble 'app' Run Configuration** to compile the `:app` module, then choose **Build > Generate App Bundles or APKs > Generate APKs** to produce the APK in `Source/Android/app/build/outputs/apk`.
+
+## Import the Dolphin code style
+
+The project maintains a custom IntelliJ/Android Studio style file to keep Java and Kotlin formatting consistent.
+
+* Go to **File > Settings > Editor > Code Style** (or **Android Studio > Settings > Editor > Code Style** on macOS).
+* Click the gear icon and choose **Import Scheme**.
+* Select `Source/Android/code-style-java.xml` from the repository.
+* Ensure that Dolphin-Java is selected.
+
+## Format code before opening a pull request
+
+Before committing or submitting a pull request, reformat any Java or Kotlin files you modified:
+
+* Use **Code > Reformat Code** (or press `Ctrl+Alt+L`/`⌥⌘L` on macOS) with the Dolphin code style selected.
+* Re-run formatting after edits to keep spacing, imports, and wrapping consistent with the rest of the project.
 
 ## Compiling from the Command-Line
 
 For command-line users, any task may be executed with `cd Source/Android` followed by `gradlew <task-name>`. In particular, `gradlew assemble` builds debug and release versions of the application (which are placed in `Source/Android/app/build/outputs/apk`).
-
-[package-icon]: https://i.imgur.com/hgmMlsM.png
-[code-style]: https://i.imgur.com/3b3UBhb.png

CMake/DolphinLibraryTools.cmake

@@ -54,7 +54,42 @@ function(dolphin_find_optional_system_library library bundled_path)
   dolphin_optional_system_library(use_system ${library})
   string(TOUPPER ${library} upperlib)
   if(use_system)
-    find_package(${library} ${ARGN})
+    # Try a list of versions
+    # Will be obsoleted if cmake ever fixes https://gitlab.kitware.com/cmake/cmake/-/issues/26477
+    if("DOLPHIN_TRY_VERSIONS" IN_LIST ARGN)
+      list(FIND ARGN DOLPHIN_TRY_VERSIONS versions_idx)
+      list(REMOVE_AT ARGN ${versions_idx})
+      # Extract list of version-like elements from ARGN into version_list
+      set(version_list)
+      while(TRUE)
+        list(LENGTH ARGN len)
+        if(len EQUAL versions_idx)
+          break()
+        endif()
+        LIST(GET ARGN ${versions_idx} ver)
+        if(ver MATCHES "^[0-9]+(\\.[0-9]+)*$")
+          list(APPEND version_list "${ver}")
+          list(REMOVE_AT ARGN ${versions_idx})
+        else()
+          break()
+        endif()
+      endwhile()
+      # Quietly check all the listed versions
+      foreach(version IN LISTS version_list)
+        find_package(${library} ${version} ${ARGN} QUIET)
+        if(${library}_FOUND)
+          break()
+        endif()
+      endforeach()
+      # If none were found, find_package one version loudly so the user sees
+      if(NOT ${library}_FOUND)
+        list(GET version_list 0 first_version)
+        find_package(${library} ${first_version} ${ARGN})
+      endif()
+    else()
+      find_package(${library} ${ARGN})
+    endif()
+
     # Yay for cmake packages being inconsistent
     if(DEFINED ${library}_FOUND)
       set(prefix ${library})

CMake/FindOProfile.cmake

@@ -33,7 +33,7 @@ endif()
 string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
 
 # version number
-set(DOLPHIN_VERSION_MAJOR "v3.1.2")
+set(DOLPHIN_VERSION_MAJOR "v3.1.5")
 set(DOLPHIN_VERSION_MINOR "0")
 set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
 

CMake/ScmRevGen.cmake

@@ -30,6 +30,10 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/CMake/FlagsOverr
 
 project(project-plus-dolphin)
 
+if (CMAKE_VERSION VERSION_LESS "3.25" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+  set(LINUX TRUE)
+endif()
+
 if (MSVC)
   if (POLICY CMP0117)
     # cmake is a weird language. You can't do if(not POLICY)
@@ -119,7 +123,6 @@ option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
 
 option(ENABLE_GPROF "Enable gprof profiling (must be using Debug build)" OFF)
 option(FASTLOG "Enable all logs" OFF)
-option(OPROFILING "Enable profiling" OFF)
 
 # TODO: Add DSPSpy
 option(DSPTOOL "Build dsptool" OFF)
@@ -169,6 +172,7 @@ list(APPEND CMAKE_MODULE_PATH
 # Support functions
 include(CheckAndAddFlag)
 include(CheckCCompilerFlag)
+include(CheckSymbolExists)
 include(DolphinCompileDefinitions)
 include(DolphinDisableWarningsMSVC)
 include(DolphinLibraryTools)
@@ -564,16 +568,6 @@ if(ENCODE_FRAMEDUMPS)
   endif()
 endif()
 
-if(OPROFILING)
-  find_package(OProfile)
-  if(OPROFILE_FOUND)
-    message(STATUS "OProfile found, enabling profiling support")
-    add_definitions(-DUSE_OPROFILE=1)
-  else()
-    message(FATAL_ERROR "OProfile not found. Can't build profiling support.")
-  endif()
-endif()
-
 if(ENABLE_HWDB)
   find_package(LIBUDEV REQUIRED)
   if(LIBUDEV_FOUND)
@@ -651,7 +645,9 @@ dolphin_find_optional_system_library_pkgconfig(FMT
 
 add_subdirectory(Externals/imgui)
 add_subdirectory(Externals/implot)
-add_subdirectory(Externals/glslang)
+
+dolphin_find_optional_system_library(glslang Externals/glslang DOLPHIN_TRY_VERSIONS 15 16)
+
 # SPIRV-Cross is used on Windows for GLSL to HLSL conversion for the Direct3D 11 and Direct3D 12
 # video backends, and on Apple devices for the Metal video backend.
 if(WIN32 OR APPLE)
@@ -737,11 +733,13 @@ dolphin_find_optional_system_library(MBEDTLS Externals/mbedtls 2.28)
 
 dolphin_find_optional_system_library(CURL Externals/curl)
 
-if(NOT ANDROID)
-  dolphin_find_optional_system_library(Iconv Externals/libiconv-1.14)
-else()
-  message(STATUS "Using static iconv from Externals")
-  add_subdirectory(Externals/libiconv-1.14 EXCLUDE_FROM_ALL)
+if(NOT WIN32)
+  if(NOT ANDROID)
+    dolphin_find_optional_system_library(Iconv Externals/libiconv 1.14)
+  else()
+    message(STATUS "Using static iconv from Externals")
+    add_subdirectory(Externals/libiconv EXCLUDE_FROM_ALL)
+  endif()
 endif()
 
 if(NOT ANDROID)
@@ -758,7 +756,7 @@ if(NOT ENABLE_QT)
   set(USE_MGBA 0)
 endif()
 if(USE_MGBA)
-  dolphin_find_optional_system_library(LIBMGBA Externals/mGBA)
+  dolphin_find_optional_system_library(LIBMGBA Externals/mGBA 0.11)
 endif()
 
 find_package(SYSTEMD)
@@ -788,6 +786,10 @@ endif()
 
 add_subdirectory(Externals/watcher)
 
+if(WIN32 OR LINUX)
+  add_subdirectory(Externals/cpp-ipc)
+endif()
+
 ########################################
 # Pre-build events: Define configuration variables and write SCM info header
 #

CMakeLists.txt

@@ -0,0 +1,23 @@
+{
+	"meta":
+	{
+		"title": "Bloom Texture Definitions",
+		"author": "iwubcode"
+	},
+	"groups":
+	[
+		{
+			"name": "Bloom",
+			"targets": [
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n41_76x56_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n42_152x112_6"
+				}
+			]
+		}
+	]
+}