specify size of buffer and use openglstate in getteximageoes

src/citra_qt/CMakeLists.txt

@@ -46,12 +46,9 @@ add_executable(citra-qt
     configuration/configure_camera.ui
     configuration/configure_debug.cpp
     configuration/configure_debug.h
-<<<<<<< HEAD
     configuration/configure_debug.ui
-=======
     configuration/configure_enhancements.cpp
     configuration/configure_enhancements.h
->>>>>>> 76ca777b... reorder graphics tab, move speed to general
     configuration/configure_dialog.cpp
     configuration/configure_dialog.h
     configuration/configure_general.cpp
@@ -160,38 +157,6 @@ add_executable(citra-qt
     util/spinbox.h
     util/util.cpp
     util/util.h
-<<<<<<< HEAD
-=======
-    compatdb.cpp
-    compatdb.h
-)
-
-set(UIS
-    configuration/configure.ui
-    configuration/configure_audio.ui
-    configuration/configure_camera.ui
-    configuration/configure_debug.ui
-    configuration/configure_enhancements.ui
-    configuration/configure_general.ui
-    configuration/configure_graphics.ui
-    configuration/configure_hotkeys.ui
-    configuration/configure_input.ui
-    configuration/configure_motion_touch.ui
-    configuration/configure_system.ui
-    configuration/configure_ui.ui
-    configuration/configure_web.ui
-    debugger/registers.ui
-    multiplayer/direct_connect.ui
-    multiplayer/lobby.ui
-    multiplayer/chat_room.ui
-    multiplayer/client_room.ui
-    multiplayer/host_room.ui
-    multiplayer/moderation_dialog.ui
-    aboutdialog.ui
-    cheats.ui
-    main.ui
-    compatdb.ui
->>>>>>> 76ca777b... reorder graphics tab, move speed to general
 )
 
 file(GLOB COMPAT_LIST

src/citra_qt/configuration/config.cpp

@@ -236,6 +236,7 @@ void Config::ReadUtilityValues() {
 
     Settings::values.dump_textures = ReadSetting("dump_textures", false).toBool();
     Settings::values.custom_textures = ReadSetting("custom_textures", false).toBool();
+    Settings::values.preload_textures = ReadSetting("preload_textures", false).toBool();
 
     qt_config->endGroup();
 }
@@ -708,6 +709,7 @@ void Config::SaveUtilityValues() {
 
     WriteSetting("dump_textures", Settings::values.dump_textures, false);
     WriteSetting("custom_textures", Settings::values.custom_textures, false);
+    WriteSetting("preload_textures", Settings::values.preload_textures, false);
 
     qt_config->endGroup();
 }

src/citra_qt/configuration/configure_dialog.cpp

@@ -75,20 +75,11 @@ Q_DECLARE_METATYPE(QList<QWidget*>);
 void ConfigureDialog::PopulateSelectionList() {
     ui->selectorList->clear();
 
-<<<<<<< HEAD
     const std::array<std::pair<QString, QList<QWidget*>>, 4> items{
         {{tr("General"), {ui->generalTab, ui->webTab, ui->debugTab, ui->uiTab}},
          {tr("System"), {ui->systemTab, ui->audioTab, ui->cameraTab}},
-         {tr("Graphics"), {ui->graphicsTab}},
+         {tr("Graphics"), {ui->enhancementsTab, ui->graphicsTab}},
          {tr("Controls"), {ui->inputTab, ui->hotkeysTab}}}};
-=======
-    const std::array<std::pair<QString, QStringList>, 4> items{
-        {{tr("General"),
-          {QT_TR_NOOP("General"), QT_TR_NOOP("Web"), QT_TR_NOOP("Debug"), QT_TR_NOOP("UI")}},
-         {tr("System"), {QT_TR_NOOP("System"), QT_TR_NOOP("Audio"), QT_TR_NOOP("Camera")}},
-         {tr("Graphics"), {QT_TR_NOOP("Enhancements"), QT_TR_NOOP("Advanced")}},
-         {tr("Controls"), {QT_TR_NOOP("Input"), QT_TR_NOOP("Hotkeys")}}}};
->>>>>>> 76ca777b... reorder graphics tab, move speed to general
 
     for (const auto& entry : items) {
         auto* const item = new QListWidgetItem(entry.first);
@@ -133,12 +124,17 @@ void ConfigureDialog::UpdateVisibleTabs() {
     if (items.isEmpty())
         return;
 
-    const std::map<QWidget*, QString> widgets = {
-        {ui->generalTab, tr("General")},   {ui->systemTab, tr("System")},
-        {ui->inputTab, tr("Input")},       {ui->hotkeysTab, tr("Hotkeys")},
-        {ui->graphicsTab, tr("Graphics")}, {ui->audioTab, tr("Audio")},
-        {ui->cameraTab, tr("Camera")},     {ui->debugTab, tr("Debug")},
-        {ui->webTab, tr("Web")},           {ui->uiTab, tr("UI")}};
+    const std::map<QWidget*, QString> widgets = {{ui->generalTab, tr("General")},
+                                                 {ui->systemTab, tr("System")},
+                                                 {ui->inputTab, tr("Input")},
+                                                 {ui->hotkeysTab, tr("Hotkeys")},
+                                                 {ui->enhancementsTab, tr("Enhancements")},
+                                                 {ui->graphicsTab, tr("Advanced")},
+                                                 {ui->audioTab, tr("Audio")},
+                                                 {ui->cameraTab, tr("Camera")},
+                                                 {ui->debugTab, tr("Debug")},
+                                                 {ui->webTab, tr("Web")},
+                                                 {ui->uiTab, tr("UI")}};
 
     ui->tabWidget->clear();
 

src/citra_qt/main.cpp

@@ -50,8 +50,8 @@
 #include "citra_qt/hotkeys.h"
 #include "citra_qt/main.h"
 #include "citra_qt/multiplayer/state.h"
-#include "citra_qt/uisettings.h"
 #include "citra_qt/qt_image_interface.h"
+#include "citra_qt/uisettings.h"
 #include "citra_qt/updater/updater.h"
 #include "citra_qt/util/clickable_label.h"
 #include "common/common_paths.h"

src/citra_qt/qt_image_interface.cpp

@@ -35,4 +35,4 @@ bool QtImageInterface::EncodePNG(const std::string& path, const std::vector<u8>&
         return false;
     }
     return true;
-}
+}

src/citra_qt/qt_image_interface.h

@@ -11,4 +11,4 @@ public:
     bool DecodePNG(std::vector<u8>& dst, u32& width, u32& height, const std::string& path) override;
     bool EncodePNG(const std::string& path, const std::vector<u8>& src, u32 width,
                    u32 height) override;
-};
+};