From 5cffa342884df531d911555f7b3db9d2f6d1d1f0 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 3 May 2023 20:42:33 -0400
Subject: settings,video_core: Consolidate ASTC decoding options

Just puts them all neatly into one place.
---
 src/yuzu/configuration/configure_graphics.ui | 51 ++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 7 deletions(-)

(limited to 'src/yuzu/configuration/configure_graphics.ui')

diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 39f70e406..91b09625b 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -181,13 +181,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QCheckBox" name="accelerate_astc">
-          <property name="text">
-           <string>Accelerate ASTC texture decoding</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QWidget" name="vsync_mode_layout" native="true">
           <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -226,6 +219,50 @@ Immediate (no synchronization) just presents whatever is available and can exhib
           </layout>
          </widget>
         </item>
+        <item>
+         <widget class="QWidget" name="astc_decode_mode_layout" native="true">
+          <layout class="QHBoxLayout" name="horizontalLayout_8">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="astc_decode_mode_label">
+             <property name="text">
+              <string>ASTC Texture Decoding Method:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="astc_decode_mode_combobox">
+             <item>
+              <property name="text">
+               <string>CPU</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>GPU Compute</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>CPU Asynchronous (Hack)</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
         <item>
          <widget class="QWidget" name="nvdec_emulation_widget" native="true">
           <layout class="QHBoxLayout" name="nvdec_emulation_layout">
-- 
cgit v1.2.3