diff options
Diffstat (limited to 'src/yuzu/configuration')
| -rw-r--r-- | src/yuzu/configuration/configure_debug.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.ui | 99 | 
2 files changed, 56 insertions, 46 deletions
| diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index cbeb8f168..b22fda746 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -59,6 +59,8 @@ void ConfigureDebug::SetConfiguration() {      ui->use_debug_asserts->setChecked(Settings::values.use_debug_asserts.GetValue());      ui->use_auto_stub->setChecked(Settings::values.use_auto_stub.GetValue());      ui->enable_all_controllers->setChecked(Settings::values.enable_all_controllers.GetValue()); +    ui->enable_renderdoc_hotkey->setEnabled(runtime_lock); +    ui->enable_renderdoc_hotkey->setChecked(Settings::values.enable_renderdoc_hotkey.GetValue());      ui->enable_graphics_debugging->setEnabled(runtime_lock);      ui->enable_graphics_debugging->setChecked(Settings::values.renderer_debug.GetValue());      ui->enable_shader_feedback->setEnabled(runtime_lock); @@ -111,6 +113,7 @@ void ConfigureDebug::ApplyConfiguration() {      Settings::values.use_auto_stub = ui->use_auto_stub->isChecked();      Settings::values.enable_all_controllers = ui->enable_all_controllers->isChecked();      Settings::values.renderer_debug = ui->enable_graphics_debugging->isChecked(); +    Settings::values.enable_renderdoc_hotkey = ui->enable_renderdoc_hotkey->isChecked();      Settings::values.renderer_shader_feedback = ui->enable_shader_feedback->isChecked();      Settings::values.cpu_debug_mode = ui->enable_cpu_debugging->isChecked();      Settings::values.enable_nsight_aftermath = ui->enable_nsight_aftermath->isChecked(); diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 97c7d9022..66b8b7459 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui @@ -18,8 +18,8 @@      <rect>       <x>0</x>       <y>0</y> -     <width>829</width> -     <height>758</height> +     <width>842</width> +     <height>741</height>      </rect>     </property>     <layout class="QVBoxLayout" name="verticalLayout_1"> @@ -260,7 +260,7 @@           <string>Graphics</string>          </property>          <layout class="QGridLayout" name="gridLayout_2"> -         <item row="3" column="0"> +         <item row="4" column="0">            <widget class="QCheckBox" name="disable_loop_safety_checks">             <property name="toolTip">              <string>When checked, it executes shaders without loop logic changes</string> @@ -270,33 +270,53 @@             </property>            </widget>           </item> -         <item row="4" column="0"> -          <widget class="QCheckBox" name="dump_shaders"> +         <item row="8" column="0"> +          <widget class="QCheckBox" name="disable_macro_hle">             <property name="enabled">              <bool>true</bool>             </property>             <property name="toolTip"> -            <string>When checked, it will dump all the original assembler shaders from the disk shader cache or game as found</string> +            <string>When checked, it disables the macro HLE functions. Enabling this makes games run slower</string>             </property>             <property name="text"> -            <string>Dump Game Shaders</string> +            <string>Disable Macro HLE</string>             </property>            </widget>           </item>           <item row="7" column="0"> -          <widget class="QCheckBox" name="disable_macro_hle"> +          <widget class="QCheckBox" name="dump_macros">             <property name="enabled">              <bool>true</bool>             </property>             <property name="toolTip"> -            <string>When checked, it disables the macro HLE functions. Enabling this makes games run slower</string> +            <string>When checked, it will dump all the macro programs of the GPU</string>             </property>             <property name="text"> -            <string>Disable Macro HLE</string> +            <string>Dump Maxwell Macros</string>             </property>            </widget>           </item> -         <item row="5" column="0"> +         <item row="3" column="0"> +          <widget class="QCheckBox" name="enable_nsight_aftermath"> +           <property name="toolTip"> +            <string>When checked, it enables Nsight Aftermath crash dumps</string> +           </property> +           <property name="text"> +            <string>Enable Nsight Aftermath</string> +           </property> +          </widget> +         </item> +         <item row="2" column="0"> +          <widget class="QCheckBox" name="enable_shader_feedback"> +           <property name="toolTip"> +            <string>When checked, yuzu will log statistics about the compiled pipeline cache</string> +           </property> +           <property name="text"> +            <string>Enable Shader Feedback</string> +           </property> +          </widget> +         </item> +         <item row="6" column="0">            <widget class="QCheckBox" name="disable_macro_jit">             <property name="enabled">              <bool>true</bool> @@ -309,6 +329,22 @@             </property>            </widget>           </item> +         <item row="9" column="0"> +          <spacer name="verticalSpacer_5"> +           <property name="orientation"> +            <enum>Qt::Vertical</enum> +           </property> +           <property name="sizeType"> +            <enum>QSizePolicy::Preferred</enum> +           </property> +           <property name="sizeHint" stdset="0"> +            <size> +             <width>20</width> +             <height>0</height> +            </size> +           </property> +          </spacer> +         </item>           <item row="0" column="0">            <widget class="QCheckBox" name="enable_graphics_debugging">             <property name="enabled"> @@ -322,55 +358,26 @@             </property>            </widget>           </item> -         <item row="6" column="0"> -          <widget class="QCheckBox" name="dump_macros"> +         <item row="5" column="0"> +          <widget class="QCheckBox" name="dump_shaders">             <property name="enabled">              <bool>true</bool>             </property>             <property name="toolTip"> -            <string>When checked, it will dump all the macro programs of the GPU</string> +            <string>When checked, it will dump all the original assembler shaders from the disk shader cache or game as found</string>             </property>             <property name="text"> -            <string>Dump Maxwell Macros</string> +            <string>Dump Game Shaders</string>             </property>            </widget>           </item>           <item row="1" column="0"> -          <widget class="QCheckBox" name="enable_shader_feedback"> -           <property name="toolTip"> -            <string>When checked, yuzu will log statistics about the compiled pipeline cache</string> -           </property> -           <property name="text"> -            <string>Enable Shader Feedback</string> -           </property> -          </widget> -         </item> -         <item row="2" column="0"> -          <widget class="QCheckBox" name="enable_nsight_aftermath"> -           <property name="toolTip"> -            <string>When checked, it enables Nsight Aftermath crash dumps</string> -           </property> +          <widget class="QCheckBox" name="enable_renderdoc_hotkey">             <property name="text"> -            <string>Enable Nsight Aftermath</string> +            <string>Enable Renderdoc Hotkey</string>             </property>            </widget>           </item> -         <item row="8" column="0"> -          <spacer name="verticalSpacer_5"> -           <property name="orientation"> -            <enum>Qt::Vertical</enum> -           </property> -           <property name="sizeType"> -            <enum>QSizePolicy::Preferred</enum> -           </property> -           <property name="sizeHint" stdset="0"> -            <size> -             <width>20</width> -             <height>0</height> -            </size> -           </property> -          </spacer> -         </item>          </layout>         </widget>        </item> | 
