mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-04-20 19:45:20 +00:00
Merge branch 'master' into perf-fix
This commit is contained in:
Elad
GitHub
commit
640d54f9a5
7 changed files with 251 additions and 187 deletions
|
|
@ -587,7 +587,10 @@
|
|||
<ClInclude Include="Emu\IPC_socket.h" />
|
||||
<ClInclude Include="Emu\localized_string.h" />
|
||||
<ClInclude Include="Emu\localized_string_id.h" />
|
||||
<ClInclude Include="Emu\NP\fb_helpers.h" />
|
||||
<ClInclude Include="Emu\NP\generated\np2_structs_generated.h" />
|
||||
<ClInclude Include="Emu\NP\np_contexts.h" />
|
||||
<ClInclude Include="Emu\NP\np_gui_cache.h" />
|
||||
<ClInclude Include="Emu\NP\np_handler.h" />
|
||||
<ClInclude Include="Emu\NP\rpcn_countries.h" />
|
||||
<ClInclude Include="Emu\NP\signaling_handler.h" />
|
||||
|
|
|
|||
|
|
@ -2650,6 +2650,15 @@
|
|||
<ClInclude Include="Emu\RSX\Host\MM.h">
|
||||
<Filter>Emu\GPU\RSX\Host Mini-Driver</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Emu\NP\fb_helpers.h">
|
||||
<Filter>Emu\NP</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Emu\NP\np_contexts.h">
|
||||
<Filter>Emu\NP</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Emu\NP\np_gui_cache.h">
|
||||
<Filter>Emu\NP</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#ifdef _WIN32
|
||||
#include "module_verifier.hpp"
|
||||
#include "util/dyn_lib.hpp"
|
||||
|
||||
#include <shellapi.h>
|
||||
|
||||
// TODO(cjj19970505@live.cn)
|
||||
// When compiling with WIN32_LEAN_AND_MEAN definition
|
||||
|
|
@ -620,11 +620,26 @@ int main(int argc, char** argv)
|
|||
std::string argument_str;
|
||||
for (int i = 0; i < argc; i++)
|
||||
{
|
||||
if (i > 0) argument_str += " ";
|
||||
argument_str += '\'' + std::string(argv[i]) + '\'';
|
||||
if (i != argc - 1) argument_str += " ";
|
||||
}
|
||||
|
||||
sys_log.notice("argc: %d, argv: %s", argc, argument_str);
|
||||
|
||||
#ifdef _WIN32
|
||||
int n_args = 0;
|
||||
if (LPWSTR* arg_list = CommandLineToArgvW(GetCommandLineW(), &n_args))
|
||||
{
|
||||
std::string utf8_args;
|
||||
for (int i = 0; i < n_args; i++)
|
||||
{
|
||||
if (i > 0) utf8_args += " ";
|
||||
utf8_args += '\'' + wchar_to_utf8(arg_list[i]) + '\'';
|
||||
}
|
||||
sys_log.notice("argv_utf8: %s", utf8_args);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Before we proceed, run some sanity checks
|
||||
run_platform_sanity_checks();
|
||||
|
||||
|
|
|
|||
|
|
@ -200,6 +200,7 @@ enum class emu_settings_type
|
|||
KeyboardType,
|
||||
EnterButtonAssignment,
|
||||
EnableHostRoot,
|
||||
EmptyHdd0Tmp,
|
||||
LimitCacheSize,
|
||||
MaximumCacheSize,
|
||||
ConsoleTimeOffset,
|
||||
|
|
@ -399,6 +400,7 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
|
|||
{ emu_settings_type::KeyboardType, { "System", "Keyboard Type"} },
|
||||
{ emu_settings_type::EnterButtonAssignment, { "System", "Enter button assignment"}},
|
||||
{ emu_settings_type::EnableHostRoot, { "VFS", "Enable /host_root/"}},
|
||||
{ emu_settings_type::EmptyHdd0Tmp, { "VFS", "Empty /dev_hdd0/tmp/"}},
|
||||
{ emu_settings_type::LimitCacheSize, { "VFS", "Limit disk cache size"}},
|
||||
{ emu_settings_type::MaximumCacheSize, { "VFS", "Disk cache maximum size (MB)"}},
|
||||
{ emu_settings_type::ConsoleTimeOffset, { "System", "Console time offset (s)"}},
|
||||
|
|
|
|||
|
|
@ -1428,6 +1428,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
|
|||
m_emu_settings->EnhanceCheckBox(ui->enableHostRoot, emu_settings_type::EnableHostRoot);
|
||||
SubscribeTooltip(ui->enableHostRoot, tooltips.settings.enable_host_root);
|
||||
|
||||
m_emu_settings->EnhanceCheckBox(ui->emptyHdd0Tmp, emu_settings_type::EmptyHdd0Tmp);
|
||||
SubscribeTooltip(ui->emptyHdd0Tmp, tooltips.settings.empty_hdd0_tmp);
|
||||
|
||||
m_emu_settings->EnhanceCheckBox(ui->enableCacheClearing, emu_settings_type::LimitCacheSize);
|
||||
SubscribeTooltip(ui->gb_DiskCacheClearing, tooltips.settings.limit_cache_size);
|
||||
if (game)
|
||||
|
|
|
|||
|
|
@ -1900,206 +1900,237 @@
|
|||
<attribute name="title">
|
||||
<string>System</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="systemTab_layout" stretch="0,0,0,0,1,0">
|
||||
<layout class="QVBoxLayout" name="systemTab_layout" stretch="0,1,0">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="systemTabLayout1" stretch="1,1,1">
|
||||
<layout class="QHBoxLayout" name="systemTabHorizontalLayout" stretch="1,1,1">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_sysLang">
|
||||
<property name="title">
|
||||
<string>Console Language</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_sysLang_layout">
|
||||
<item>
|
||||
<widget class="QComboBox" name="sysLangBox"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_keyboardType">
|
||||
<property name="title">
|
||||
<string>Keyboard Type</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_keyboardType">
|
||||
<item>
|
||||
<widget class="QComboBox" name="keyboardType"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_homebrew">
|
||||
<property name="title">
|
||||
<string>Homebrew</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_homebrew_layout">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="enableHostRoot">
|
||||
<property name="text">
|
||||
<string>Enable /host_root/</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="systemTabLayout2" stretch="1,1,1">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_console_region">
|
||||
<property name="title">
|
||||
<string>Console Region</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_console_region_layout">
|
||||
<item>
|
||||
<widget class="QComboBox" name="console_region"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_console_time">
|
||||
<property name="title">
|
||||
<string>Console Time</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<layout class="QVBoxLayout" name="systemTabLeftLayout">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_sysLang">
|
||||
<property name="title">
|
||||
<string>Console Language</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_sysLang_layout">
|
||||
<item>
|
||||
<widget class="QDateTimeEdit" name="console_time_edit">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>10</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="layoutDirection">
|
||||
<enum>Qt::LayoutDirection::LeftToRight</enum>
|
||||
</property>
|
||||
<property name="wrapping">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="frame">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignmentFlag::AlignCenter</set>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="buttonSymbols">
|
||||
<enum>QAbstractSpinBox::ButtonSymbols::UpDownArrows</enum>
|
||||
</property>
|
||||
<property name="accelerated">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="showGroupSeparator" stdset="0">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="calendarPopup">
|
||||
<bool>true</bool>
|
||||
<widget class="QComboBox" name="sysLangBox"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_console_region">
|
||||
<property name="title">
|
||||
<string>Console Region</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_console_region_layout">
|
||||
<item>
|
||||
<widget class="QComboBox" name="console_region"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_enterButtonAssignment">
|
||||
<property name="title">
|
||||
<string>Enter Button Assignment</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_enterButtonAssignment_layout">
|
||||
<item>
|
||||
<widget class="QRadioButton" name="enterButtonAssignCircle">
|
||||
<property name="text">
|
||||
<string notr="true">Enter with the Circle button</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="console_time_reset">
|
||||
<widget class="QRadioButton" name="enterButtonAssignCross">
|
||||
<property name="text">
|
||||
<string>Set to Now</string>
|
||||
<string notr="true">Enter with the Cross button</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_DiskCacheClearing">
|
||||
<property name="title">
|
||||
<string>Disk Cache</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_DiskCacheClearing_layout">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="enableCacheClearing">
|
||||
<property name="text">
|
||||
<string>Clear cache automatically</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="maximumCacheSizeLabel">
|
||||
<property name="text">
|
||||
<string>Cache size: 3072 MB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="maximumCacheSize">
|
||||
<property name="pageStep">
|
||||
<number>512</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Orientation::Horizontal</enum>
|
||||
</property>
|
||||
<property name="tickPosition">
|
||||
<enum>QSlider::TickPosition::TicksBelow</enum>
|
||||
</property>
|
||||
<property name="tickInterval">
|
||||
<number>1024</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="systemTabLeftVerticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Orientation::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="systemTabSpacerWidget2" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="systemTabLayout3" stretch="1,1,1">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_enterButtonAssignment">
|
||||
<property name="title">
|
||||
<string>Enter Button Assignment</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_enterButtonAssignment_layout">
|
||||
<item>
|
||||
<widget class="QRadioButton" name="enterButtonAssignCircle">
|
||||
<property name="text">
|
||||
<string notr="true">Enter with the Circle button</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="enterButtonAssignCross">
|
||||
<property name="text">
|
||||
<string notr="true">Enter with the Cross button</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<layout class="QVBoxLayout" name="systemTabMiddleLayout">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_keyboardType">
|
||||
<property name="title">
|
||||
<string>Keyboard Type</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_keyboardType">
|
||||
<item>
|
||||
<widget class="QComboBox" name="keyboardType"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_console_time">
|
||||
<property name="title">
|
||||
<string>Console Time</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QDateTimeEdit" name="console_time_edit">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>10</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="layoutDirection">
|
||||
<enum>Qt::LayoutDirection::LeftToRight</enum>
|
||||
</property>
|
||||
<property name="wrapping">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="frame">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignmentFlag::AlignCenter</set>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="buttonSymbols">
|
||||
<enum>QAbstractSpinBox::ButtonSymbols::UpDownArrows</enum>
|
||||
</property>
|
||||
<property name="accelerated">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="showGroupSeparator" stdset="0">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="calendarPopup">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="console_time_reset">
|
||||
<property name="text">
|
||||
<string>Set to Now</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="systemTabMiddleVerticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Orientation::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="systemTabSpacerWidget3" native="true"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="systemTabSpacerWidget4" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="systemTabLayout4" stretch="1,1,1">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_DiskCacheClearing">
|
||||
<property name="title">
|
||||
<string>Disk Cache</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_DiskCacheClearing_layout">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="enableCacheClearing">
|
||||
<property name="text">
|
||||
<string>Clear cache automatically</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="maximumCacheSizeLabel">
|
||||
<property name="text">
|
||||
<string>Cache size: 3072 MB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="maximumCacheSize">
|
||||
<property name="pageStep">
|
||||
<number>512</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Orientation::Horizontal</enum>
|
||||
</property>
|
||||
<property name="tickPosition">
|
||||
<enum>QSlider::TickPosition::TicksBelow</enum>
|
||||
</property>
|
||||
<property name="tickInterval">
|
||||
<number>1024</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="systemTabSpacerWidget5" native="true"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="systemTabSpacerWidget6" native="true"/>
|
||||
<layout class="QVBoxLayout" name="systemTabRightLayout">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="gb_homebrew">
|
||||
<property name="title">
|
||||
<string>Homebrew</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="gb_homebrew_layout">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="enableHostRoot">
|
||||
<property name="text">
|
||||
<string>Enable /host_root/</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="emptyHdd0Tmp">
|
||||
<property name="text">
|
||||
<string>Empty /dev_hdd0/tmp/</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="systemTabRightVerticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Orientation::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
|
|
|
|||
|
|
@ -260,7 +260,8 @@ public:
|
|||
const QString system_language = tr("Some games may fail to boot if the system language is not available in the game itself.\nOther games will switch language automatically to what is selected here.\nIt is recommended leaving this on a language supported by the game.");
|
||||
const QString keyboard_type = tr("Sets the used keyboard layout.\nCurrently only US, Japanese and German layouts are fully supported at this moment.");
|
||||
const QString enter_button_assignment = tr("The button used for enter/accept/confirm in system dialogs.\nChange this to use the Circle button instead, which is the default configuration on Japanese systems and in many Japanese games.\nIn these cases having the cross button assigned can often lead to confusion.");
|
||||
const QString enable_host_root = tr("Required for some Homebrew.\nIf unsure, don't use this option.");
|
||||
const QString enable_host_root = tr("Required for some Homebrew.\nIf unsure, do not use this option.");
|
||||
const QString empty_hdd0_tmp = tr("Required for some Homebrew or Game Mods.\nIf unsure, do not use this option");
|
||||
const QString limit_cache_size = tr("Automatically removes older files from disk cache on boot if it grows larger than the specified value.\nGames can use the cache folder to temporarily store data outside of system memory. It is not used for long-term storage.\n\nThis setting is only available in the global configuration.");
|
||||
const QString console_time_offset = tr("Sets the time to be used within the console. This will be applied as an offset that tracks wall clock time.\nCan be reset to current wall clock time by clicking \"Set to Now\".");
|
||||
} settings;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue