diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp index 8ba7411e1f..32f3c92669 100644 --- a/Utilities/Log.cpp +++ b/Utilities/Log.cpp @@ -3,6 +3,7 @@ #include "StrFmt.h" #include "sema.h" +#include "Utilities/sysinfo.h" #include "rpcs3_version.h" #include #include @@ -64,7 +65,7 @@ namespace logs : file_writer(name) , 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()); } diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index 2e7e4c4e17..d83a7694e0 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -20,7 +20,7 @@ struct Render_Creator QStringList D3D12Adapters; QStringList vulkanAdapters; 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"); Render_Creator(); diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 374627eaf8..f80eb0505c 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -357,6 +357,15 @@ settings_dialog::settings_dialog(std::shared_ptr xSettings, const xemu_settings->EnhanceComboBox(ui->renderBox, emu_settings::Renderer); 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); ui->resBox->setToolTip(json_gpu_cbo["resBox"].toString());