mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-05 08:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Vulkan debug options to the Debug tab

Browse Source
This commit is contained in:
tomboylover93 2025-01-27 21:55:04 -03:00
parent 2837d848ed
commit 9fee8a666a
11 changed files with 162 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/config.cpp
View File

@ -267,18 +267,28 @@ bool vkValidationGpuEnabled() {
return vkValidationGpu;
}
bool vkCrashDiagnosticEnabled() {
bool getVkCrashDiagnosticEnabled() {
return vkCrashDiagnostic;
}
bool vkHostMarkersEnabled() {
// Forced on when crash diagnostic enabled.
return vkHostMarkers || vkCrashDiagnostic;
bool getVkHostMarkersEnabled() {
return vkHostMarkers;
}
bool vkGuestMarkersEnabled() {
// Forced on when crash diagnostic enabled.
return vkGuestMarkers || vkCrashDiagnostic;
bool getVkGuestMarkersEnabled() {
return vkGuestMarkers;
}
void setVkCrashDiagnosticEnabled(bool enable) {
vkCrashDiagnostic = enable;
}
void setVkHostMarkersEnabled(bool enable) {
vkHostMarkers = enable;
}
void setVkGuestMarkersEnabled(bool enable) {
vkGuestMarkers = enable;
}
bool getSeparateUpdateEnabled() {

9
src/common/config.h
View File

@ -106,9 +106,12 @@ void setRdocEnabled(bool enable);
bool vkValidationEnabled();
bool vkValidationSyncEnabled();
bool vkValidationGpuEnabled();
bool vkCrashDiagnosticEnabled();
bool vkHostMarkersEnabled();
bool vkGuestMarkersEnabled();
bool getVkCrashDiagnosticEnabled();
bool getVkHostMarkersEnabled();
bool getVkGuestMarkersEnabled();
void setVkCrashDiagnosticEnabled(bool enable);
void setVkHostMarkersEnabled(bool enable);
void setVkGuestMarkersEnabled(bool enable);
// Gui
void setMainWindowGeometry(u32 x, u32 y, u32 w, u32 h);

6
src/emulator.cpp
View File

@ -66,9 +66,9 @@ Emulator::Emulator() {
LOG_INFO(Config, "Vulkan vkValidation: {}", Config::vkValidationEnabled());
LOG_INFO(Config, "Vulkan vkValidationSync: {}", Config::vkValidationSyncEnabled());
LOG_INFO(Config, "Vulkan vkValidationGpu: {}", Config::vkValidationGpuEnabled());
LOG_INFO(Config, "Vulkan crashDiagnostics: {}", Config::vkCrashDiagnosticEnabled());
LOG_INFO(Config, "Vulkan hostMarkers: {}", Config::vkHostMarkersEnabled());
LOG_INFO(Config, "Vulkan guestMarkers: {}", Config::vkGuestMarkersEnabled());
LOG_INFO(Config, "Vulkan crashDiagnostics: {}", Config::getVkCrashDiagnosticEnabled());
LOG_INFO(Config, "Vulkan hostMarkers: {}", Config::getVkHostMarkersEnabled());
LOG_INFO(Config, "Vulkan guestMarkers: {}", Config::getVkGuestMarkersEnabled());
LOG_INFO(Config, "Vulkan rdocEnable: {}", Config::isRdocEnabled());
// Create stdin/stdout/stderr

4
src/imgui/renderer/imgui_core.cpp
View File

@ -208,7 +208,7 @@ void Render(const vk::CommandBuffer& cmdbuf, const vk::ImageView& image_view,
return;
}
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
cmdbuf.beginDebugUtilsLabelEXT(vk::DebugUtilsLabelEXT{
.pLabelName = "ImGui Render",
});
@ -233,7 +233,7 @@ void Render(const vk::CommandBuffer& cmdbuf, const vk::ImageView& image_view,
cmdbuf.beginRendering(render_info);
Vulkan::RenderDrawData(*draw_data, cmdbuf);
cmdbuf.endRendering();
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
cmdbuf.endDebugUtilsLabelEXT();
}
}

2
src/imgui/renderer/texture_manager.cpp
View File

@ -152,7 +152,7 @@ void WorkerLoop() {
g_job_list.pop_front();
g_job_list_mtx.unlock();
if (Config::vkCrashDiagnosticEnabled()) {
if (Config::getVkCrashDiagnosticEnabled()) {
// FIXME: Crash diagnostic hangs when building the command buffer here
continue;
}

33
src/qt_gui/settings_dialog.cpp
View File

@ -285,6 +285,11 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices,
ui->vkValidationCheckBox->installEventFilter(this);
ui->vkSyncValidationCheckBox->installEventFilter(this);
ui->rdocCheckBox->installEventFilter(this);
ui->crashDiagnosticsCheckBox->installEventFilter(this);
ui->guestMarkersCheckBox->installEventFilter(this);
ui->hostMarkersCheckBox->installEventFilter(this);
ui->collectShaderCheckBox->installEventFilter(this);
ui->copyGPUBuffersCheckBox->installEventFilter(this);
}
}
@ -360,6 +365,15 @@ void SettingsDialog::LoadValuesFromConfig() {
ui->vkSyncValidationCheckBox->setChecked(
toml::find_or<bool>(data, "Vulkan", "validation_sync", false));
ui->rdocCheckBox->setChecked(toml::find_or<bool>(data, "Vulkan", "rdocEnable", false));
ui->crashDiagnosticsCheckBox->setChecked(
toml::find_or<bool>(data, "Vulkan", "crashDiagnostic", false));
ui->guestMarkersCheckBox->setChecked(
toml::find_or<bool>(data, "Vulkan", "guestMarkers", false));
ui->hostMarkersCheckBox->setChecked(toml::find_or<bool>(data, "Vulkan", "hostMarkers", false));
ui->copyGPUBuffersCheckBox->setChecked(
toml::find_or<bool>(data, "GPU", "copyGPUBuffers", false));
ui->collectShaderCheckBox->setChecked(
toml::find_or<bool>(data, "Debug", "CollectShader", false));
ui->enableCompatibilityCheckBox->setChecked(
toml::find_or<bool>(data, "General", "compatibilityEnabled", false));
ui->checkCompatibilityOnStartupCheckBox->setChecked(
@ -380,7 +394,7 @@ void SettingsDialog::LoadValuesFromConfig() {
std::string chooseHomeTab = toml::find_or<std::string>(data, "General", "chooseHomeTab", "");
ui->chooseHomeTabComboBox->setCurrentText(QString::fromStdString(chooseHomeTab));
QStringList tabNames = {tr("General"), tr("Gui"), tr("Graphics"), tr("User"),
QStringList tabNames = {tr("General"), tr("GUI"), tr("Graphics"), tr("User"),
tr("Input"), tr("Paths"), tr("Debug")};
QString chooseHomeTabQString = QString::fromStdString(chooseHomeTab);
int indexTab = tabNames.indexOf(chooseHomeTabQString);
@ -549,8 +563,16 @@ void SettingsDialog::updateNoteTextEdit(const QString& elementName) {
text = tr("vkValidationCheckBox");
} else if (elementName == "vkSyncValidationCheckBox") {
text = tr("vkSyncValidationCheckBox");
} else if (elementName == "rdocCheckBox") {
text = tr("rdocCheckBox");
} else if (elementName == "crashDiagnosticsCheckBox") {
text = tr("crashDiagnosticsCheckBox");
} else if (elementName == "guestMarkersCheckBox") {
text = tr("guestMarkersCheckBox");
} else if (elementName == "hostMarkersCheckBox") {
text = tr("hostMarkersCheckBox");
} else if (elementName == "copyGPUBuffersCheckBox") {
text = tr("copyGPUBuffersCheckBox");
} else if (elementName == "collectShaderCheckBox") {
text = tr("collectShaderCheckBox");
}
ui->descriptionText->setText(text.replace("\\n", "\n"));
@ -604,6 +626,11 @@ void SettingsDialog::UpdateSettings() {
Config::setVkValidation(ui->vkValidationCheckBox->isChecked());
Config::setVkSyncValidation(ui->vkSyncValidationCheckBox->isChecked());
Config::setRdocEnabled(ui->rdocCheckBox->isChecked());
Config::setVkHostMarkersEnabled(ui->hostMarkersCheckBox->isChecked());
Config::setVkGuestMarkersEnabled(ui->guestMarkersCheckBox->isChecked());
Config::setVkCrashDiagnosticEnabled(ui->crashDiagnosticsCheckBox->isChecked());
Config::setCollectShaderForDebug(ui->collectShaderCheckBox->isChecked());
Config::setCopyGPUCmdBuffers(ui->copyGPUBuffersCheckBox->isChecked());
Config::setAutoUpdate(ui->updateCheckBox->isChecked());
Config::setUpdateChannel(ui->updateComboBox->currentText().toStdString());
Config::setChooseHomeTab(ui->chooseHomeTabComboBox->currentText().toStdString());

95
src/qt_gui/settings_dialog.ui
View File

@ -12,7 +12,7 @@
<x>0</x>
<y>0</y>
<width>970</width>
<height>600</height>
<height>750</height>
</rect>
</property>
<property name="sizePolicy">
@ -74,7 +74,7 @@
<x>0</x>
<y>0</y>
<width>946</width>
<height>386</height>
<height>535</height>
</rect>
</property>
<layout class="QVBoxLayout" name="generalTabVLayout" stretch="0">
@ -476,15 +476,15 @@
<bool>true</bool>
</property>
<attribute name="title">
<string>Gui</string>
<string>GUI</string>
</attribute>
<widget class="QWidget" name="guiTabContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>386</height>
<width>676</width>
<height>381</height>
</rect>
</property>
<layout class="QVBoxLayout" name="guiTabVLayout" stretch="0">
@ -546,7 +546,7 @@
</item>
<item>
<property name="text">
<string>Gui</string>
<string>GUI</string>
</property>
</item>
<item>
@ -809,8 +809,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>386</height>
<width>563</width>
<height>143</height>
</rect>
</property>
<layout class="QVBoxLayout" name="graphicsTabVLayout" stretch="0,0">
@ -1053,8 +1053,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>386</height>
<width>244</width>
<height>295</height>
</rect>
</property>
<layout class="QVBoxLayout" name="debugTabVLayout" stretch="0,0,1">
@ -1197,8 +1197,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>386</height>
<width>475</width>
<height>253</height>
</rect>
</property>
<layout class="QVBoxLayout" name="inputTabVLayout" stretch="0,0">
@ -1481,8 +1481,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>386</height>
<width>216</width>
<height>256</height>
</rect>
</property>
<layout class="QVBoxLayout" name="pathsTabLayout">
@ -1571,11 +1571,11 @@
<rect>
<x>0</x>
<y>0</y>
<width>946</width>
<height>386</height>
<width>534</width>
<height>477</height>
</rect>
</property>
<layout class="QVBoxLayout" name="debugTabVLayout" stretch="0,1">
<layout class="QVBoxLayout" name="debugTabVLayout" stretch="0,0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin">
@ -1585,7 +1585,7 @@
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="debugTabHLayout" stretch="1">
<layout class="QHBoxLayout" name="debugTabHLayout" stretch="0">
<item>
<widget class="QGroupBox" name="debugTabGroupBox">
<property name="enabled">
@ -1728,20 +1728,57 @@
</layout>
</item>
<item>
<spacer name="debugTabSpacer">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<widget class="QGroupBox" name="advancedGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
<property name="title">
<string>Advanced</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
</spacer>
<layout class="QVBoxLayout" name="advancedLayout">
<item>
<widget class="QCheckBox" name="crashDiagnosticsCheckBox">
<property name="text">
<string>Enable Crash Diagnostics</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="collectShaderCheckBox">
<property name="text">
<string>Collect Shaders</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="copyGPUBuffersCheckBox">
<property name="text">
<string>Copy GPU Buffers</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="hostMarkersCheckBox">
<property name="text">
<string>Host Debug Markers</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="guestMarkersCheckBox">
<property name="text">
<string>Guest Debug Markers</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>

20
src/qt_gui/translations/en.ts
View File

@ -928,6 +928,26 @@
<source>rdocCheckBox</source>
<translation>Enable RenderDoc Debugging:\nIf enabled, the emulator will provide compatibility with Renderdoc to allow capture and analysis of the currently rendered frame.</translation>
</message>
<message>
<source>collectShaderCheckBox</source>
<translation>You need this enabled to edit shaders with the debug menu (Ctrl + F10).</translation>
</message>
<message>
<source>crashDiagnosticsCheckBox</source>
<translation>Creates a .yaml file with info about the Vulkan state at the time of crashing.\nUseful for debugging 'Device lost' errors. If you have this enabled, you should enable Host AND Guest Debug Markers.\nDoes not work on Intel GPUs.\nYou need Vulkan Validation Layers enabled and the Vulkan SDK for this to work.</translation>
</message>
<message>
<source>copyGPUBuffersCheckBox</source>
<translation>Gets around race conditions involving GPU submits.\nMay or may not help with PM4 type 0 crashes.</translation>
</message>
<message>
<source>hostMarkersCheckBox</source>
<translation>Inserts emulator-side information like markers for specific AMDGPU commands around Vulkan commands, as well as giving resources debug names.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc.</translation>
</message>
<message>
<source>guestMarkersCheckBox</source>
<translation>Inserts any debug markers the game itself has added to the command buffer.\nIf you have this enabled, you should enable Crash Diagnostics.\nUseful for programs like RenderDoc.</translation>
</message>
<message>
<source>saveDataBox</source>
<translation>Save Data Path:\nThe folder where game save data will be saved.</translation>

4
src/video_core/renderer_vulkan/vk_platform.h
View File

@ -33,7 +33,7 @@ concept VulkanHandleType = vk::isVulkanHandleType<T>::value;
template <VulkanHandleType HandleType>
void SetObjectName(vk::Device device, const HandleType& handle, std::string_view debug_name) {
if (!Config::vkHostMarkersEnabled()) {
if (!Config::getVkHostMarkersEnabled()) {
return;
}
const vk::DebugUtilsObjectNameInfoEXT name_info = {
@ -50,7 +50,7 @@ void SetObjectName(vk::Device device, const HandleType& handle, std::string_view
template <VulkanHandleType HandleType, typename... Args>
void SetObjectName(vk::Device device, const HandleType& handle, const char* format,
const Args&... args) {
if (!Config::vkHostMarkersEnabled()) {
if (!Config::getVkHostMarkersEnabled()) {
return;
}
const std::string debug_name = fmt::vformat(format, fmt::make_format_args(args...));

14
src/video_core/renderer_vulkan/vk_presenter.cpp
View File

@ -294,7 +294,7 @@ void Presenter::CreatePostProcessPipeline() {
Presenter::Presenter(Frontend::WindowSDL& window_, AmdGpu::Liverpool* liverpool_)
: window{window_}, liverpool{liverpool_},
instance{window, Config::getGpuId(), Config::vkValidationEnabled(),
Config::vkCrashDiagnosticEnabled()},
Config::getVkCrashDiagnosticEnabled()},
draw_scheduler{instance}, present_scheduler{instance}, flip_scheduler{instance},
swapchain{instance, window},
rasterizer{std::make_unique<Rasterizer>(instance, draw_scheduler, liverpool)},
@ -467,7 +467,7 @@ bool Presenter::ShowSplash(Frame* frame /*= nullptr*/) {
draw_scheduler.EndRendering();
const auto cmdbuf = draw_scheduler.CommandBuffer();
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
cmdbuf.beginDebugUtilsLabelEXT(vk::DebugUtilsLabelEXT{
.pLabelName = "ShowSplash",
});
@ -541,7 +541,7 @@ bool Presenter::ShowSplash(Frame* frame /*= nullptr*/) {
.pImageMemoryBarriers = &post_barrier,
});
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
cmdbuf.endDebugUtilsLabelEXT();
}
@ -573,7 +573,7 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
auto& scheduler = is_eop ? draw_scheduler : flip_scheduler;
scheduler.EndRendering();
const auto cmdbuf = scheduler.CommandBuffer();
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
const auto label = fmt::format("PrepareFrameInternal:{}", image_id.index);
cmdbuf.beginDebugUtilsLabelEXT(vk::DebugUtilsLabelEXT{
.pLabelName = label.c_str(),
@ -704,7 +704,7 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
.pImageMemoryBarriers = &post_barrier,
});
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
cmdbuf.endDebugUtilsLabelEXT();
}
@ -755,7 +755,7 @@ void Presenter::Present(Frame* frame, bool is_reusing_frame) {
auto& scheduler = present_scheduler;
const auto cmdbuf = scheduler.CommandBuffer();
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
cmdbuf.beginDebugUtilsLabelEXT(vk::DebugUtilsLabelEXT{
.pLabelName = "Present",
});
@ -857,7 +857,7 @@ void Presenter::Present(Frame* frame, bool is_reusing_frame) {
}
}
if (Config::vkHostMarkersEnabled()) {
if (Config::getVkHostMarkersEnabled()) {
cmdbuf.endDebugUtilsLabelEXT();
}

16
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@ -1242,8 +1242,8 @@ void Rasterizer::UpdateViewportScissorState(const GraphicsPipeline& pipeline) {
}
void Rasterizer::ScopeMarkerBegin(const std::string_view& str, bool from_guest) {
if ((from_guest && !Config::vkGuestMarkersEnabled()) ||
(!from_guest && !Config::vkHostMarkersEnabled())) {
if ((from_guest && !Config::getVkGuestMarkersEnabled()) ||
(!from_guest && !Config::getVkHostMarkersEnabled())) {
return;
}
const auto cmdbuf = scheduler.CommandBuffer();
@ -1253,8 +1253,8 @@ void Rasterizer::ScopeMarkerBegin(const std::string_view& str, bool from_guest)
}
void Rasterizer::ScopeMarkerEnd(bool from_guest) {
if ((from_guest && !Config::vkGuestMarkersEnabled()) ||
(!from_guest && !Config::vkHostMarkersEnabled())) {
if ((from_guest && !Config::getVkGuestMarkersEnabled()) ||
(!from_guest && !Config::getVkHostMarkersEnabled())) {
return;
}
const auto cmdbuf = scheduler.CommandBuffer();
@ -1262,8 +1262,8 @@ void Rasterizer::ScopeMarkerEnd(bool from_guest) {
}
void Rasterizer::ScopedMarkerInsert(const std::string_view& str, bool from_guest) {
if ((from_guest && !Config::vkGuestMarkersEnabled()) ||
(!from_guest && !Config::vkHostMarkersEnabled())) {
if ((from_guest && !Config::getVkGuestMarkersEnabled()) ||
(!from_guest && !Config::getVkHostMarkersEnabled())) {
return;
}
const auto cmdbuf = scheduler.CommandBuffer();
@ -1274,8 +1274,8 @@ void Rasterizer::ScopedMarkerInsert(const std::string_view& str, bool from_guest
void Rasterizer::ScopedMarkerInsertColor(const std::string_view& str, const u32 color,
bool from_guest) {
if ((from_guest && !Config::vkGuestMarkersEnabled()) ||
(!from_guest && !Config::vkHostMarkersEnabled())) {
if ((from_guest && !Config::getVkGuestMarkersEnabled()) ||
(!from_guest && !Config::getVkHostMarkersEnabled())) {
return;
}
const auto cmdbuf = scheduler.CommandBuffer();