Merge pull request #216 from SachinVin/disk-shader

Add Disk shader cache

externals/catch

@@ -1 +1 @@
-Subproject commit de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad
+Subproject commit 15cf3caaceb21172ea42a24e595a2eb58c3ec960

externals/dynarmic

@@ -1 +1 @@
-Subproject commit 358cf6f0357baae3e3bb5788431acf1068f897b5
+Subproject commit f9d84871fb6dd41c47945d649dc9017aa3762125

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java

@@ -97,11 +97,13 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
     }
 
     @Override
-    public void showSettingsFragment(String menuTag, boolean addToStack, String gameID) {
-        if (!addToStack && getFragment() != null) {
-            return;
-        }
+    public void onBackPressed() {
+        mPresenter.onBackPressed();
+    }
 
+
+    @Override
+    public void showSettingsFragment(String menuTag, boolean addToStack, String gameID) {
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
         if (addToStack) {
@@ -114,6 +116,7 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
             }
 
             transaction.addToBackStack(null);
+            mPresenter.addToStack();
         }
         transaction.replace(R.id.frame_content, SettingsFragment.newInstance(menuTag, gameID), FRAGMENT_TAG);
 
@@ -204,6 +207,11 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
         Toast.makeText(this, message, is_long ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show();
     }
 
+    @Override
+    public void popBackStack() {
+        getSupportFragmentManager().popBackStackImmediate();
+    }
+
     @Override
     public void onSettingChanged() {
         mPresenter.onSettingChanged();

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java

@@ -22,6 +22,8 @@ public final class SettingsActivityPresenter {
 
     private Settings mSettings = new Settings();
 
+    private int mStackCount;
+
     private boolean mShouldSave;
 
     private DirectoryStateReceiver directoryStateReceiver;
@@ -43,6 +45,7 @@ public final class SettingsActivityPresenter {
     }
 
     public void onStart() {
+        this.mStackCount = 0;
         prepareCitraDirectoriesIfNeeded();
     }
 
@@ -114,6 +117,19 @@ public final class SettingsActivityPresenter {
         NativeLibrary.ReloadSettings();
     }
 
+    public void addToStack() {
+        mStackCount++;
+    }
+
+    public void onBackPressed() {
+        if (mStackCount > 0) {
+            mView.popBackStack();
+            mStackCount--;
+        } else {
+            mView.finish();
+        }
+    }
+
     public void onSettingChanged() {
         mShouldSave = true;
     }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java

@@ -55,6 +55,11 @@ public interface SettingsActivityView {
      */
     void showToastMessage(String message, boolean is_long);
 
+    /**
+     * Show the previous fragment.
+     */
+    void popBackStack();
+
     /**
      * End the activity.
      */

src/android/app/src/main/jni/id_cache.cpp

@@ -34,8 +34,6 @@ static jmethodID s_request_camera_permission;
 static jmethodID s_request_mic_permission;
 static jmethodID s_disk_cache_load_progress;
 
-static std::unordered_map<VideoCore::LoadCallbackStage, jobject> s_java_load_callback_stages;
-
 namespace IDCache {
 
 JNIEnv* GetEnvForThread() {
@@ -117,13 +115,6 @@ jmethodID GetDiskCacheLoadProgress() {
     return s_disk_cache_load_progress;
 }
 
-jobject GetJavaLoadCallbackStage(VideoCore::LoadCallbackStage stage) {
-    const auto it = s_java_load_callback_stages.find(stage);
-    ASSERT_MSG(it != s_java_load_callback_stages.end(), "Invalid LoadCallbackStage: {}", stage);
-
-    return it->second;
-}
-
 } // namespace IDCache
 
 #ifdef __cplusplus
@@ -147,7 +138,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
         FileUtil::GetUserPath(FileUtil::UserPath::LogDir) + LOG_FILE));
     LOG_INFO(Frontend, "Logging backend initialised");
 
-    // Initialize Java classes
+    // Initialize Java methods
     const jclass native_library_class = env->FindClass("org/citra/citra_emu/NativeLibrary");
     s_native_library_class = reinterpret_cast<jclass>(env->NewGlobalRef(native_library_class));
     s_savestate_info_class = reinterpret_cast<jclass>(
@@ -159,7 +150,6 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     s_load_callback_stage_class = reinterpret_cast<jclass>(env->NewGlobalRef(env->FindClass(
         "org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage")));
 
-    // Initialize Java methods
     s_on_core_error = env->GetStaticMethodID(
         s_native_library_class, "OnCoreError",
         "(Lorg/citra/citra_emu/NativeLibrary$CoreError;Ljava/lang/String;)Z");
@@ -183,25 +173,6 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
         s_disk_cache_progress_class, "loadProgress",
         "(Lorg/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage;II)V");
 
-    // Initialize LoadCallbackStage map
-    const auto to_java_load_callback_stage = [env](const std::string& stage) {
-        jclass load_callback_stage_class = IDCache::GetDiskCacheLoadCallbackStageClass();
-        return env->NewGlobalRef(env->GetStaticObjectField(
-            load_callback_stage_class,
-            env->GetStaticFieldID(load_callback_stage_class, stage.c_str(),
-                                  "Lorg/citra/citra_emu/disk_shader_cache/"
-                                  "DiskShaderCacheProgress$LoadCallbackStage;")));
-    };
-
-    s_java_load_callback_stages.emplace(VideoCore::LoadCallbackStage::Prepare,
-                                        to_java_load_callback_stage("Prepare"));
-    s_java_load_callback_stages.emplace(VideoCore::LoadCallbackStage::Decompile,
-                                        to_java_load_callback_stage("Decompile"));
-    s_java_load_callback_stages.emplace(VideoCore::LoadCallbackStage::Build,
-                                        to_java_load_callback_stage("Build"));
-    s_java_load_callback_stages.emplace(VideoCore::LoadCallbackStage::Complete,
-                                        to_java_load_callback_stage("Complete"));
-
     MiiSelector::InitJNI(env);
     SoftwareKeyboard::InitJNI(env);
     Camera::StillImage::InitJNI(env);
@@ -218,13 +189,6 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
     env->DeleteGlobalRef(s_native_library_class);
     env->DeleteGlobalRef(s_savestate_info_class);
     env->DeleteGlobalRef(s_core_error_class);
-    env->DeleteGlobalRef(s_disk_cache_progress_class);
-    env->DeleteGlobalRef(s_load_callback_stage_class);
-
-    for (auto& [key, object] : s_java_load_callback_stages) {
-        env->DeleteGlobalRef(object);
-    }
-
     MiiSelector::CleanupJNI(env);
     SoftwareKeyboard::CleanupJNI(env);
     Camera::StillImage::CleanupJNI(env);

src/android/app/src/main/jni/id_cache.h

@@ -7,7 +7,6 @@
 #include <memory>
 #include <type_traits>
 #include <jni.h>
-#include "video_core/rasterizer_interface.h"
 
 namespace IDCache {
 
@@ -28,8 +27,6 @@ jmethodID GetRequestCameraPermission();
 jmethodID GetRequestMicPermission();
 jmethodID GetDiskCacheLoadProgress();
 
-jobject GetJavaLoadCallbackStage(VideoCore::LoadCallbackStage stage);
-
 } // namespace IDCache
 
 template <typename T = jobject>

src/android/app/src/main/jni/native.cpp

@@ -119,12 +119,40 @@ static bool HandleCoreError(Core::System::ResultStatus result, const std::string
                                         env->NewStringUTF(details.c_str())) != JNI_FALSE;
 }
 
+static jobject ToJavaLoadCallbackStage(VideoCore::LoadCallbackStage stage) {
+    const char* name;
+    switch (stage) {
+    case VideoCore::LoadCallbackStage::Prepare:
+        name = "Prepare";
+        break;
+    case VideoCore::LoadCallbackStage::Decompile:
+        name = "Decompile";
+        break;
+    case VideoCore::LoadCallbackStage::Build:
+        name = "Build";
+        break;
+    case VideoCore::LoadCallbackStage::Complete:
+        name = "Complete";
+        break;
+    default:
+        UNREACHABLE();
+    }
+
+    JNIEnv* env = IDCache::GetEnvForThread();
+
+    jclass load_callback_stage_class = IDCache::GetDiskCacheLoadCallbackStageClass();
+    return env->GetStaticObjectField(
+        load_callback_stage_class,
+        env->GetStaticFieldID(
+            load_callback_stage_class, name,
+            "Lorg/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage;"));
+}
+
 static void LoadDiskCacheProgress(VideoCore::LoadCallbackStage stage, int progress, int max) {
     JNIEnv* env = IDCache::GetEnvForThread();
     env->CallStaticVoidMethod(IDCache::GetDiskCacheProgressClass(),
-                              IDCache::GetDiskCacheLoadProgress(),
-                              IDCache::GetJavaLoadCallbackStage(stage), static_cast<jint>(progress),
-                              static_cast<jint>(max));
+                              IDCache::GetDiskCacheLoadProgress(), ToJavaLoadCallbackStage(stage),
+                              (jint)progress, (jint)max);
 }
 
 static Camera::NDK::Factory* g_ndk_factory{};

src/citra/config.cpp

@@ -201,10 +201,6 @@ void Config::ReadValues() {
     // Data Storage
     Settings::values.use_virtual_sd =
         sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
-    Settings::values.nand_dir = sdl2_config->GetString(
-        "Data Storage", "nand_directory", FileUtil::GetUserPath(FileUtil::UserPath::NANDDir));
-    Settings::values.sdmc_dir = sdl2_config->GetString(
-        "Data Storage", "sdmc_directory", FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir));
 
     // System
     Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", true);

src/citra/default_ini.h

@@ -250,14 +250,6 @@ volume =
 # 1 (default): Yes, 0: No
 use_virtual_sd =
 
-# The path of the virtual SD card directory.
-# empty (default) will use the user_path
-sdmc_directory =
-
-# The path of NAND directory.
-# empty (default) will use the user_path
-nand_directory =
-
 [System]
 # The system model that Citra will try to emulate
 # 0: Old 3DS, 1: New 3DS (default)

src/citra_qt/CMakeLists.txt

@@ -66,9 +66,6 @@ add_executable(citra-qt
     configuration/configure_motion_touch.cpp
     configuration/configure_motion_touch.h
     configuration/configure_motion_touch.ui
-    configuration/configure_storage.cpp
-    configuration/configure_storage.h
-    configuration/configure_storage.ui
     configuration/configure_system.cpp
     configuration/configure_system.h
     configuration/configure_system.ui

src/citra_qt/bootmanager.cpp

@@ -104,7 +104,7 @@ void EmuThread::run() {
 }
 
 OpenGLWindow::OpenGLWindow(QWindow* parent, QWidget* event_handler, QOpenGLContext* shared_context)
-    : QWindow(parent), context(std::make_unique<QOpenGLContext>(shared_context->parent())),
+    : QWindow(parent), context(new QOpenGLContext(shared_context->parent())),
       event_handler(event_handler) {
 
     // disable vsync for any shared contexts
@@ -447,8 +447,8 @@ std::unique_ptr<Frontend::GraphicsContext> GRenderWindow::CreateSharedContext()
 }
 
 GLContext::GLContext(QOpenGLContext* shared_context)
-    : context(std::make_unique<QOpenGLContext>(shared_context->parent())),
-      surface(std::make_unique<QOffscreenSurface>(nullptr)) {
+    : context(new QOpenGLContext(shared_context->parent())),
+      surface(new QOffscreenSurface(nullptr)) {
 
     // disable vsync for any shared contexts
     auto format = shared_context->format();
@@ -463,7 +463,7 @@ GLContext::GLContext(QOpenGLContext* shared_context)
 }
 
 void GLContext::MakeCurrent() {
-    context->makeCurrent(surface.get());
+    context->makeCurrent(surface);
 }
 
 void GLContext::DoneCurrent() {

src/citra_qt/bootmanager.h

@@ -6,7 +6,6 @@
 
 #include <atomic>
 #include <condition_variable>
-#include <memory>
 #include <mutex>
 #include <QThread>
 #include <QWidget>
@@ -37,8 +36,8 @@ public:
     void DoneCurrent() override;
 
 private:
-    std::unique_ptr<QOpenGLContext> context;
-    std::unique_ptr<QOffscreenSurface> surface;
+    QOpenGLContext* context;
+    QOffscreenSurface* surface;
 };
 
 class EmuThread final : public QThread {
@@ -139,7 +138,7 @@ protected:
     void exposeEvent(QExposeEvent* event) override;
 
 private:
-    std::unique_ptr<QOpenGLContext> context;
+    QOpenGLContext* context;
     QWidget* event_handler;
 };
 

src/citra_qt/configuration/config.cpp

@@ -302,16 +302,6 @@ void Config::ReadDataStorageValues() {
     qt_config->beginGroup(QStringLiteral("Data Storage"));
 
     Settings::values.use_virtual_sd = ReadSetting(QStringLiteral("use_virtual_sd"), true).toBool();
-    std::string nand_dir = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir);
-    Settings::values.nand_dir =
-        ReadSetting(QStringLiteral("nand_directory"), QString::fromStdString(nand_dir))
-            .toString()
-            .toStdString();
-    std::string sdmc_dir = FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir);
-    Settings::values.sdmc_dir =
-        ReadSetting(QStringLiteral("sdmc_directory"), QString::fromStdString(sdmc_dir))
-            .toString()
-            .toStdString();
 
     qt_config->endGroup();
 }
@@ -862,12 +852,6 @@ void Config::SaveDataStorageValues() {
     qt_config->beginGroup(QStringLiteral("Data Storage"));
 
     WriteSetting(QStringLiteral("use_virtual_sd"), Settings::values.use_virtual_sd, true);
-    WriteSetting(QStringLiteral("nand_directory"),
-                 QString::fromStdString(Settings::values.nand_dir),
-                 QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir)));
-    WriteSetting(QStringLiteral("sdmc_directory"),
-                 QString::fromStdString(Settings::values.sdmc_dir),
-                 QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir)));
 
     qt_config->endGroup();
 }

src/citra_qt/configuration/configure.ui

@@ -68,11 +68,6 @@
          <string>Debug</string>
         </attribute>
        </widget>
-       <widget class="ConfigureStorage" name="storageTab">
-        <attribute name="title">
-         <string>Storage</string>
-        </attribute>
-       </widget>
        <widget class="ConfigureWeb" name="webTab">
         <attribute name="title">
          <string>Web</string>
@@ -126,12 +121,6 @@
    <extends>QWidget</extends>
    <header>configuration/configure_debug.h</header>
    <container>1</container>
-  </customwidget>
-    <customwidget>
-   <class>ConfigureStorage</class>
-   <extends>QWidget</extends>
-   <header>configuration/configure_storage.h</header>
-   <container>1</container>
   </customwidget>
   <customwidget>
    <class>ConfigureInput</class>

src/citra_qt/configuration/configure_dialog.cpp

@@ -51,7 +51,6 @@ void ConfigureDialog::SetConfiguration() {
     ui->debugTab->SetConfiguration();
     ui->webTab->SetConfiguration();
     ui->uiTab->SetConfiguration();
-    ui->storageTab->SetConfiguration();
 }
 
 void ConfigureDialog::ApplyConfiguration() {
@@ -67,7 +66,6 @@ void ConfigureDialog::ApplyConfiguration() {
     ui->debugTab->ApplyConfiguration();
     ui->webTab->ApplyConfiguration();
     ui->uiTab->ApplyConfiguration();
-    ui->storageTab->ApplyConfiguration();
     Settings::Apply();
     Settings::LogSettings();
 }
@@ -79,7 +77,7 @@ void ConfigureDialog::PopulateSelectionList() {
 
     const std::array<std::pair<QString, QList<QWidget*>>, 5> items{
         {{tr("General"), {ui->generalTab, ui->webTab, ui->debugTab, ui->uiTab}},
-         {tr("System"), {ui->systemTab, ui->cameraTab, ui->storageTab}},
+         {tr("System"), {ui->systemTab, ui->cameraTab}},
          {tr("Graphics"), {ui->enhancementsTab, ui->graphicsTab}},
          {tr("Audio"), {ui->audioTab}},
          {tr("Controls"), {ui->inputTab, ui->hotkeysTab}}}};
@@ -120,7 +118,6 @@ void ConfigureDialog::RetranslateUI() {
     ui->debugTab->RetranslateUI();
     ui->webTab->RetranslateUI();
     ui->uiTab->RetranslateUI();
-    ui->storageTab->RetranslateUI();
 }
 
 void ConfigureDialog::UpdateVisibleTabs() {
@@ -137,7 +134,6 @@ void ConfigureDialog::UpdateVisibleTabs() {
                                                  {ui->audioTab, tr("Audio")},
                                                  {ui->cameraTab, tr("Camera")},
                                                  {ui->debugTab, tr("Debug")},
-                                                 {ui->storageTab, tr("Storage")},
                                                  {ui->webTab, tr("Web")},
                                                  {ui->uiTab, tr("UI")}};
 

src/citra_qt/configuration/configure_storage.cpp

@@ -1,78 +0,0 @@
-// Copyright 2021 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QUrl>
-#include "citra_qt/configuration/configure_storage.h"
-#include "core/core.h"
-#include "core/settings.h"
-#include "ui_configure_storage.h"
-
-ConfigureStorage::ConfigureStorage(QWidget* parent)
-    : QWidget(parent), ui(std::make_unique<Ui::ConfigureStorage>()) {
-    ui->setupUi(this);
-    SetConfiguration();
-
-    connect(ui->open_nand_dir, &QPushButton::clicked, []() {
-        QString path = QString::fromStdString(Settings::values.nand_dir);
-        QDesktopServices::openUrl(QUrl::fromLocalFile(path));
-    });
-
-    connect(ui->change_nand_dir, &QPushButton::clicked, this, [this]() {
-        const QString dir_path = QFileDialog::getExistingDirectory(
-            this, tr("Select NAND Directory"), QString::fromStdString(Settings::values.nand_dir),
-            QFileDialog::ShowDirsOnly);
-        if (!dir_path.isEmpty()) {
-            Settings::values.nand_dir = dir_path.toStdString();
-            SetConfiguration();
-        }
-    });
-
-    connect(ui->open_sdmc_dir, &QPushButton::clicked, []() {
-        QString path = QString::fromStdString(Settings::values.sdmc_dir);
-        QDesktopServices::openUrl(QUrl::fromLocalFile(path));
-    });
-
-    connect(ui->change_sdmc_dir, &QPushButton::clicked, this, [this]() {
-        const QString dir_path = QFileDialog::getExistingDirectory(
-            this, tr("Select SDMC Directory"), QString::fromStdString(Settings::values.sdmc_dir),
-            QFileDialog::ShowDirsOnly);
-        if (!dir_path.isEmpty()) {
-            Settings::values.sdmc_dir = dir_path.toStdString();
-            SetConfiguration();
-        }
-    });
-
-    connect(ui->toggle_virtual_sd, &QCheckBox::clicked, this, [this]() {
-        ApplyConfiguration();
-        SetConfiguration();
-    });
-}
-
-ConfigureStorage::~ConfigureStorage() = default;
-
-void ConfigureStorage::SetConfiguration() {
-    ui->nand_group->setVisible(Settings::values.use_virtual_sd);
-    QString nand_path = QString::fromStdString(Settings::values.nand_dir);
-    ui->nand_dir_path->setText(nand_path);
-    ui->open_nand_dir->setEnabled(!Settings::values.nand_dir.empty());
-
-    ui->sdmc_group->setVisible(Settings::values.use_virtual_sd);
-    QString sdmc_path = QString::fromStdString(Settings::values.sdmc_dir);
-    ui->sdmc_dir_path->setText(sdmc_path);
-    ui->open_sdmc_dir->setEnabled(!Settings::values.sdmc_dir.empty());
-
-    ui->toggle_virtual_sd->setChecked(Settings::values.use_virtual_sd);
-
-    ui->storage_group->setEnabled(!Core::System::GetInstance().IsPoweredOn());
-}
-
-void ConfigureStorage::ApplyConfiguration() {
-    Settings::values.use_virtual_sd = ui->toggle_virtual_sd->isChecked();
-}
-
-void ConfigureStorage::RetranslateUI() {
-    ui->retranslateUi(this);
-}

src/citra_qt/configuration/configure_storage.h

@@ -1,26 +0,0 @@
-// Copyright 2021 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <memory>
-#include <QWidget>
-
-namespace Ui {
-class ConfigureStorage;
-}
-
-class ConfigureStorage : public QWidget {
-    Q_OBJECT
-
-public:
-    explicit ConfigureStorage(QWidget* parent = nullptr);
-    ~ConfigureStorage() override;
-
-    void ApplyConfiguration();
-    void RetranslateUI();
-    void SetConfiguration();
-
-    std::unique_ptr<Ui::ConfigureStorage> ui;
-};

src/citra_qt/configuration/configure_storage.ui

@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ConfigureStorage</class>
- <widget class="QWidget" name="ConfigureStorage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>681</width>
-    <height>375</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_1">
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <widget class="QGroupBox" name="storage_group">
-       <property name="title">
-        <string>Storage</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_1">
-          <item>
-           <widget class="QCheckBox" name="toggle_virtual_sd">
-            <property name="text">
-             <string>Use Virtual SD</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="nand_group">
-          <property name="title">
-           <string/>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout">
-             <item>
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>NAND Directory</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="nand_dir_path">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QPushButton" name="open_nand_dir">
-               <property name="text">
-                <string>Open</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <item>
-              <widget class="QLabel" name="label_4">
-               <property name="text">
-                <string>NOTE: this does not move the contents of the previous directory to the new one</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QPushButton" name="change_nand_dir">
-               <property name="text">
-                <string>Change</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="sdmc_group">
-          <property name="title">
-           <string/>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_4">
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_3">
-             <item>
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>SDMC Directory</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="sdmc_dir_path">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QPushButton" name="open_sdmc_dir">
-               <property name="text">
-                <string>Open</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <widget class="QLabel" name="label_3">
-               <property name="text">
-                <string>NOTE: this does not move the contents of the previous directory to the new one</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QPushButton" name="change_sdmc_dir">
-               <property name="text">
-                <string>Change</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/common/file_util.cpp

@@ -12,7 +12,6 @@
 #include "common/common_paths.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
-#include "core/settings.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -717,13 +716,8 @@ void SetUserPath(const std::string& path) {
         }
 #endif
     }
-
-    g_paths.emplace(UserPath::SDMCDir, !Settings::values.sdmc_dir.empty()
-                                           ? Settings::values.sdmc_dir
-                                           : user_path + SDMC_DIR DIR_SEP);
-    g_paths.emplace(UserPath::NANDDir, !Settings::values.nand_dir.empty()
-                                           ? Settings::values.nand_dir
-                                           : user_path + NAND_DIR DIR_SEP);
+    g_paths.emplace(UserPath::SDMCDir, user_path + SDMC_DIR DIR_SEP);
+    g_paths.emplace(UserPath::NANDDir, user_path + NAND_DIR DIR_SEP);
     g_paths.emplace(UserPath::SysDataDir, user_path + SYSDATA_DIR DIR_SEP);
     // TODO: Put the logs in a better location for each OS
     g_paths.emplace(UserPath::LogDir, user_path + LOG_DIR DIR_SEP);
@@ -768,11 +762,6 @@ const std::string& GetUserPath(UserPath path) {
         SetUserPath();
     return g_paths[path];
 }
-
-const void UpdateUserPath(UserPath path, const std::string& filename) {
-    g_paths[path] = filename + DIR_SEP;
-}
-
 std::size_t WriteStringToFile(bool text_file, const std::string& filename, std::string_view str) {
     return IOFile(filename, text_file ? "w" : "wb").WriteString(str);
 }

src/common/file_util.h

@@ -186,9 +186,6 @@ void SetCurrentRomPath(const std::string& path);
 // directory. To be used in "multi-user" mode (that is, installed).
 [[nodiscard]] const std::string& GetUserPath(UserPath path);
 
-// Update the Global Path with the new value
-const void UpdateUserPath(UserPath path, const std::string& filename);
-
 // Returns the path to where the sys file are
 [[nodiscard]] std::string GetSysDirectory();
 

src/core/settings.cpp

@@ -121,8 +121,6 @@ void LogSettings() {
     log_setting("Camera_OuterLeftConfig", values.camera_config[OuterLeftCamera]);
     log_setting("Camera_OuterLeftFlip", values.camera_flip[OuterLeftCamera]);
     log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd);
-    log_setting("DataStorage_SdmcDir", values.sdmc_dir);
-    log_setting("DataStorage_NandDir", values.nand_dir);
     log_setting("System_IsNew3ds", values.is_new_3ds);
     log_setting("System_RegionValue", values.region_value);
     log_setting("Debugging_UseGdbstub", values.use_gdbstub);

src/core/settings.h

@@ -176,8 +176,6 @@ struct Values {
 
     // Data Storage
     bool use_virtual_sd;
-    std::string nand_dir;
-    std::string sdmc_dir;
 
     // System
     int region_value;

src/network/room.cpp

@@ -912,7 +912,7 @@ void Room::RoomImpl::HandleChatPacket(const ENetEvent* event) {
     }
 
     // Limit the size of chat messages to MaxMessageSize
-    message.resize(std::min(static_cast<u32>(message.size()), MaxMessageSize));
+    message.resize(MaxMessageSize);
 
     Packet out_packet;
     out_packet << static_cast<u8>(IdChatMessage);

src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -62,11 +62,6 @@ RasterizerOpenGL::RasterizerOpenGL(Frontend::EmuWindow& emu_window)
                     "Shadow might not be able to render because of unsupported OpenGL extensions.");
     }
 
-    if (!GLAD_GL_ARB_copy_image && !GLES) {
-        LOG_WARNING(Render_OpenGL,
-                    "ARB_copy_image not supported. Some games might produce artifacts.");
-    }
-
     // Clipping plane 0 is always enabled for PICA fixed clip plane z <= 0
     state.clip_distance[0] = true;
 
@@ -786,7 +781,7 @@ bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) {
     }
 
     OGLTexture temp_tex;
-    if (need_duplicate_texture && (GLAD_GL_ARB_copy_image || GLES)) {
+    if (need_duplicate_texture) {
         // The game is trying to use a surface as a texture and framebuffer at the same time
         // which causes unpredictable behavior on the host.
         // Making a copy to sample from eliminates this issue and seems to be fairly cheap.

src/video_core/renderer_opengl/gl_rasterizer_cache.cpp

@@ -843,6 +843,14 @@ void CachedSurface::DownloadGLTexture(const Common::Rectangle<u32>& rect, GLuint
         return;
     }
 
+    if (GLES) {
+        if (type == SurfaceType::Depth || type == SurfaceType::DepthStencil) {
+            // TODO(bunnei): This is unsupported on GLES right now, fixme
+            LOG_WARNING(Render_OpenGL, "Unsupported depth/stencil surface download");
+            return;
+        }
+    }
+
     MICROPROFILE_SCOPE(OpenGL_TextureDL);
 
     if (gl_buffer.empty()) {

src/video_core/renderer_opengl/gl_shader_disk_cache.cpp

@@ -387,10 +387,6 @@ void ShaderDiskCache::SaveDecompiled(u64 unique_identifier,
 void ShaderDiskCache::SaveDump(u64 unique_identifier, GLuint program) {
     if (!IsUsable())
         return;
-    if (!GLAD_GL_ARB_get_program_binary) {
-        LOG_WARNING(Render_OpenGL, "ARB_get_program_binary is not supported. Problems may occur if "
-                                   "use_disk_shader_cache is ON.");
-    }
 
     GLint binary_length{};
     glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &binary_length);