archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

(#3214)

Browse source 
Adds cpu to log.
Adds [DO NOT USE] to D3D12 selection.
This commit is contained in:
RipleyTom 2017-08-13 17:32:48 +02:00 • committed by Ivan
parent a909bd6edd
commit 80fee5ac1e
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utilities/Log.cpp
View file

@ -3,6 +3,7 @@
#include "StrFmt.h" #include "StrFmt.h"
#include "sema.h" #include "sema.h"
#include "Utilities/sysinfo.h"
#include "rpcs3_version.h" #include "rpcs3_version.h"
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@ -64,7 +65,7 @@ namespace logs
: file_writer(name) : file_writer(name)
, listener() , listener()
{ {
const std::string& start = fmt::format("\xEF\xBB\xBF" "RPCS3 v%s\n", rpcs3::version.to_string()); const std::string& start = fmt::format("\xEF\xBB\xBF" "RPCS3 v%s\n%s\n", rpcs3::version.to_string(), utils::get_system_info());
file_writer::log(start.data(), start.size()); file_writer::log(start.data(), start.size());
} }

2
rpcs3/rpcs3qt/emu_settings.h
View file

@ -20,7 +20,7 @@ struct Render_Creator
QStringList D3D12Adapters; QStringList D3D12Adapters;
QStringList vulkanAdapters; QStringList vulkanAdapters;
QString render_Vulkan = QObject::tr("Vulkan"); QString render_Vulkan = QObject::tr("Vulkan");
QString render_D3D12 = QObject::tr("D3D12"); QString render_D3D12 = QObject::tr("D3D12[DO NOT USE]");
QString render_OpenGL = QObject::tr("OpenGL"); QString render_OpenGL = QObject::tr("OpenGL");
Render_Creator(); Render_Creator();

9
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -357,6 +357,15 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
xemu_settings->EnhanceComboBox(ui->renderBox, emu_settings::Renderer); xemu_settings->EnhanceComboBox(ui->renderBox, emu_settings::Renderer);
ui->renderBox->setToolTip(json_gpu_cbo["renderBox"].toString()); ui->renderBox->setToolTip(json_gpu_cbo["renderBox"].toString());
//Change D3D12 to D3D12[DO NOT USE]
for (int i = 0; i < ui->renderBox->count(); i++)
{
if (ui->renderBox->itemText(i) == "D3D12")
{
ui->renderBox->setItemText(i, r_Creator.render_D3D12);
break;
}
}
xemu_settings->EnhanceComboBox(ui->resBox, emu_settings::Resolution); xemu_settings->EnhanceComboBox(ui->resBox, emu_settings::Resolution);
ui->resBox->setToolTip(json_gpu_cbo["resBox"].toString()); ui->resBox->setToolTip(json_gpu_cbo["resBox"].toString());