RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

rsx/Qt: add option to disable the shader compilation hint

Browse Source
This commit is contained in:
Megamouse 2018-03-20 02:00:49 +01:00 committed by Ivan
parent 9fcba58537
commit 9d961f620b
7 changed files with 167 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -1061,15 +1061,18 @@ void GLGSRender::load_program(const gl::vertex_upload_info& upload_info)
m_shaders_cache->store(pipeline_properties, vertex_program, fragment_program); m_shaders_cache->store(pipeline_properties, vertex_program, fragment_program);
//Notify the user with HUD notification //Notify the user with HUD notification
if (!m_custom_ui) if (g_cfg.misc.show_shader_compilation_hint)
{ {
//Create notification but do not draw it at this time. No need to spam flip requests if (!m_custom_ui)
m_custom_ui = std::make_unique<rsx::overlays::shader_compile_notification>(); {
} //Create notification but do not draw it at this time. No need to spam flip requests
else if (auto casted = dynamic_cast<rsx::overlays::shader_compile_notification*>(m_custom_ui.get())) m_custom_ui = std::make_unique<rsx::overlays::shader_compile_notification>();
{ }
//Probe the notification else if (auto casted = dynamic_cast<rsx::overlays::shader_compile_notification*>(m_custom_ui.get()))
casted->touch(); {
//Probe the notification
casted->touch();
}
} }
} }

19
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View File

@ -2303,15 +2303,18 @@ void VKGSRender::load_program(const vk::vertex_upload_info& vertex_info)
m_shaders_cache->store(properties, vertex_program, fragment_program); m_shaders_cache->store(properties, vertex_program, fragment_program);
//Notify the user with HUD notification //Notify the user with HUD notification
if (!m_custom_ui) if (g_cfg.misc.show_shader_compilation_hint)
{ {
//Create notification but do not draw it at this time. No need to spam flip requests if (!m_custom_ui)
m_custom_ui = std::make_unique<rsx::overlays::shader_compile_notification>(); {
} //Create notification but do not draw it at this time. No need to spam flip requests
else if (auto casted = dynamic_cast<rsx::overlays::shader_compile_notification*>(m_custom_ui.get())) m_custom_ui = std::make_unique<rsx::overlays::shader_compile_notification>();
{ }
//Probe the notification else if (auto casted = dynamic_cast<rsx::overlays::shader_compile_notification*>(m_custom_ui.get()))
casted->touch(); {
//Probe the notification
casted->touch();
}
} }
} }

1
rpcs3/Emu/System.h
View File

@ -433,6 +433,7 @@ struct cfg_root : cfg::node
cfg::_bool start_fullscreen{ this, "Start games in fullscreen mode" }; cfg::_bool start_fullscreen{ this, "Start games in fullscreen mode" };
cfg::_bool show_fps_in_title{ this, "Show FPS counter in window title", true}; cfg::_bool show_fps_in_title{ this, "Show FPS counter in window title", true};
cfg::_bool show_trophy_popups{ this, "Show trophy popups", true}; cfg::_bool show_trophy_popups{ this, "Show trophy popups", true};
cfg::_bool show_shader_compilation_hint{ this, "Show shader compilation hint", true };
cfg::_bool use_native_interface{ this, "Use native user interface", true }; cfg::_bool use_native_interface{ this, "Use native user interface", true };
cfg::_int<1, 65535> gdb_server_port{this, "Port", 2345}; cfg::_int<1, 65535> gdb_server_port{this, "Port", 2345};

1
rpcs3/Json/tooltips.json
View File

@ -65,6 +65,7 @@
"showTrophyPopups": "Show trophy popups when a trophy is unlocked.", "showTrophyPopups": "Show trophy popups when a trophy is unlocked.",
"gs_disableMouse": "Disables the activation of fullscreen mode per doubleclick while the game screen is active.\nCheck this if you want to play with mouse and keyboard (for example with UCR).", "gs_disableMouse": "Disables the activation of fullscreen mode per doubleclick while the game screen is active.\nCheck this if you want to play with mouse and keyboard (for example with UCR).",
"maxLLVMThreads": "Limits the maximum number of threads used for PPU Module compilation.\nLower this in order to increase performance of other open applications.\nThe default uses all available threads.", "maxLLVMThreads": "Limits the maximum number of threads used for PPU Module compilation.\nLower this in order to increase performance of other open applications.\nThe default uses all available threads.",
"showShaderCompilationHint": "Show shader compilation hints using the native overlay.",
"useNativeInterface": "Enables use of native HUD within the game window that can interact with game controllers.\nWhen disabled, regular Qt dialogs are used instead.\nCurrently, only the English language is supported." "useNativeInterface": "Enables use of native HUD within the game window that can interact with game controllers.\nWhen disabled, regular Qt dialogs are used instead.\nCurrently, only the English language is supported."
} }
}, },

22
rpcs3/rpcs3qt/emu_settings.h
View File

@ -88,6 +88,7 @@ public:
ShowTrophyPopups, ShowTrophyPopups,
ShowWelcomeScreen, ShowWelcomeScreen,
UseNativeInterface, UseNativeInterface,
ShowShaderCompilationHint,
// Network // Network
ConnectionStatus, ConnectionStatus,
@ -240,20 +241,21 @@ private:
{ Move, { "Input/Output", "Move" }}, { Move, { "Input/Output", "Move" }},
// Misc // Misc
{ExitRPCS3OnFinish, { "Miscellaneous", "Exit RPCS3 when process finishes" }}, { ExitRPCS3OnFinish, { "Miscellaneous", "Exit RPCS3 when process finishes" }},
{StartOnBoot, { "Miscellaneous", "Automatically start games after boot" }}, { StartOnBoot, { "Miscellaneous", "Automatically start games after boot" }},
{StartGameFullscreen, { "Miscellaneous", "Start games in fullscreen mode"}}, { StartGameFullscreen, { "Miscellaneous", "Start games in fullscreen mode"}},
{ShowFPSInTitle, { "Miscellaneous", "Show FPS counter in window title"}}, { ShowFPSInTitle, { "Miscellaneous", "Show FPS counter in window title"}},
{ShowTrophyPopups, { "Miscellaneous", "Show trophy popups"}}, { ShowTrophyPopups, { "Miscellaneous", "Show trophy popups"}},
{ShowWelcomeScreen, { "Miscellaneous", "Show Welcome Screen"}}, { ShowWelcomeScreen, { "Miscellaneous", "Show Welcome Screen"}},
{UseNativeInterface, { "Miscellaneous", "Use native user interface"}}, { UseNativeInterface, { "Miscellaneous", "Use native user interface"}},
{ ShowShaderCompilationHint, { "Miscellaneous", "Show shader compilation hint"}},
// Networking // Networking
{ConnectionStatus, { "Net", "Connection status"}}, { ConnectionStatus, { "Net", "Connection status"}},
// System // System
{Language, { "System", "Language"}}, { Language, { "System", "Language"}},
{EnableHostRoot, { "VFS", "Enable /host_root/"}}, { EnableHostRoot, { "VFS", "Enable /host_root/"}},
// Virtual File System // Virtual File System
{ emulatorLocation, { "VFS", "$(EmulatorDir)"}}, { emulatorLocation, { "VFS", "$(EmulatorDir)"}},

3
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -730,6 +730,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
xemu_settings->EnhanceCheckBox(ui->useNativeInterface, emu_settings::UseNativeInterface); xemu_settings->EnhanceCheckBox(ui->useNativeInterface, emu_settings::UseNativeInterface);
SubscribeTooltip(ui->useNativeInterface, json_emu_misc["useNativeInterface"].toString()); SubscribeTooltip(ui->useNativeInterface, json_emu_misc["useNativeInterface"].toString());
xemu_settings->EnhanceCheckBox(ui->showShaderCompilationHint, emu_settings::ShowShaderCompilationHint);
SubscribeTooltip(ui->showShaderCompilationHint, json_emu_misc["showShaderCompilationHint"].toString());
if (game) if (game)
{ {
ui->gb_stylesheets->setEnabled(false); ui->gb_stylesheets->setEnabled(false);

233
rpcs3/rpcs3qt/settings_dialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1011</width> <width>816</width>
<height>775</height> <height>570</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -1226,11 +1226,18 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_47"> <layout class="QVBoxLayout" name="verticalLayout_47">
<item> <item>
<widget class="QGroupBox" name="groupBox_55"> <widget class="QGroupBox" name="gb_emu_settings">
<property name="title"> <property name="title">
<string>Emulator Settings</string> <string>Emulator Settings</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_41"> <layout class="QVBoxLayout" name="verticalLayout_41">
<item>
<widget class="QCheckBox" name="cb_show_welcome">
<property name="text">
<string>Show Welcome Screen</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="exitOnStop"> <widget class="QCheckBox" name="exitOnStop">
<property name="text"> <property name="text">
@ -1273,9 +1280,48 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="showShaderCompilationHint">
<property name="text">
<string>Show shader compilation hint</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_13">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="gb_max_llvm">
<property name="title">
<string>Max LLVM Compile Threads</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_63">
<item>
<widget class="QComboBox" name="maxLLVMThreads"/>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_60">
<item> <item>
<widget class="QGroupBox" name="gb_viewport"> <widget class="QGroupBox" name="gb_viewport">
<property name="title"> <property name="title">
@ -1368,108 +1414,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_58">
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Max LLVM Compile Threads</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_63">
<item>
<widget class="QComboBox" name="maxLLVMThreads"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_settings">
<property name="title">
<string>UI Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_42">
<item>
<widget class="QCheckBox" name="cb_show_welcome">
<property name="text">
<string>Show Welcome Screen</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_reset_default">
<property name="text">
<string>Restore default settings</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_backup_config">
<property name="text">
<string>Save current settings</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_open_folder">
<property name="text">
<string>Open configuration folder</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QComboBox" name="combo_configs"/>
</item>
<item>
<widget class="QPushButton" name="pb_apply_config">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_60">
<item>
<widget class="QGroupBox" name="gb_stylesheets">
<property name="title">
<string>UI Stylesheets</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_43">
<item>
<widget class="QComboBox" name="combo_stylesheets"/>
</item>
<item>
<widget class="QPushButton" name="pb_apply_stylesheet">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="gb_colors"> <widget class="QGroupBox" name="gb_colors">
<property name="title"> <property name="title">
@ -1525,6 +1469,85 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_58">
<item>
<widget class="QGroupBox" name="gb_stylesheets">
<property name="title">
<string>UI Stylesheets</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_43">
<item>
<widget class="QComboBox" name="combo_stylesheets"/>
</item>
<item>
<widget class="QPushButton" name="pb_apply_stylesheet">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_settings">
<property name="title">
<string>UI Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_42">
<item>
<widget class="QPushButton" name="pb_reset_default">
<property name="text">
<string>Restore default settings</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_backup_config">
<property name="text">
<string>Save current settings</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_open_folder">
<property name="text">
<string>Open configuration folder</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QComboBox" name="combo_configs"/>
</item>
<item>
<widget class="QPushButton" name="pb_apply_config">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
<item> <item>