mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-04-21 20:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'shadps4-emu:main' into main

Browse source
This commit is contained in:
Lander Gallastegi 2024-09-09 10:56:18 +02:00 • committed by GitHub
commit 6f3ceeba46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/libraries/system/msgdialog_ui.cpp
View file

@ -253,8 +253,7 @@ void MsgDialogUi::Draw() {
SetNextWindowCollapsed(false);
KeepNavHighlight();
// Hack to allow every dialog to have a unique window
if (Begin("Message Dialog##MessageDialog", nullptr,
ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoSavedSettings)) {
if (Begin("Message Dialog##MessageDialog", nullptr, ImGuiWindowFlags_NoSavedSettings)) {
switch (state->GetMode()) {
case MsgDialogMode::USER_MSG:
DrawUser();
@ -266,8 +265,8 @@ void MsgDialogUi::Draw() {
DrawSystemMessage();
break;
}
End();
}
End();
first_render = false;
}

6
src/imgui/layer/video_info.cpp
View file

@ -9,8 +9,10 @@ void ImGui::Layers::VideoInfo::Draw() {
m_show = IsKeyPressed(ImGuiKey_F10, false) ^ m_show;
if (m_show && Begin("Video Info")) {
Text("Frame time: %.3f ms (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
if (m_show) {
if (Begin("Video Info")) {
Text("Frame time: %.3f ms (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
}
End();
}
}

12
src/video_core/amdgpu/liverpool.cpp
View file

@ -221,11 +221,15 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
const auto marker_sz = nop->header.count.Value() * 2;
const std::string_view label{reinterpret_cast<const char*>(&nop->data_block[1]),
marker_sz};
rasterizer->ScopeMarkerBegin(label);
if (rasterizer) {
rasterizer->ScopeMarkerBegin(label);
}
break;
}
case PM4CmdNop::PayloadType::DebugMarkerPop: {
rasterizer->ScopeMarkerEnd();
if (rasterizer) {
rasterizer->ScopeMarkerEnd();
}
break;
}
default:
@ -536,7 +540,9 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
break;
}
case PM4ItOpcode::PfpSyncMe: {
rasterizer->CpSync();
if (rasterizer) {
rasterizer->CpSync();
}
break;
}
default: