Merge branch 'shadps4-emu:main' into bb-deadlock-shaders-fixes

Foul-Tarnished · Sep 9, 2024 · 14259eb · 14259eb
2 parents 9438980 + adfb3af
commit 14259eb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/core/libraries/system/msgdialog_ui.cpp b/src/core/libraries/system/msgdialog_ui.cpp
@@ -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;
 }
diff --git a/src/imgui/layer/video_info.cpp b/src/imgui/layer/video_info.cpp
@@ -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();
     }
 }
diff --git a/src/video_core/amdgpu/liverpool.cpp b/src/video_core/amdgpu/liverpool.cpp
@@ -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: