From 8d380e260afef6098907873019a265cf9e6d1e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 3 Oct 2024 11:59:56 +0200 Subject: [PATCH] Fix a wrong assert --- Common/GPU/Vulkan/thin3d_vulkan.cpp | 2 +- UI/EmuScreen.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Common/GPU/Vulkan/thin3d_vulkan.cpp b/Common/GPU/Vulkan/thin3d_vulkan.cpp index 71037b0e3d..d785f020f8 100644 --- a/Common/GPU/Vulkan/thin3d_vulkan.cpp +++ b/Common/GPU/Vulkan/thin3d_vulkan.cpp @@ -383,7 +383,7 @@ public: BackendState GetCurrentBackendState() const override { return BackendState{ (u32)renderManager_.GetNumSteps(), - true, + true, // Means that the other value is meaningful. }; } diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index d079a9d958..6ce765d395 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -1328,12 +1328,6 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) { return flags; // shouldn't really happen but I've seen a suspicious stack trace.. } - // Sanity check -#ifdef _DEBUG - Draw::BackendState state = draw->GetCurrentBackendState(); - _dbg_assert_(!state.valid || state.passes == 0); -#endif - GamepadUpdateOpacity(); bool skipBufferEffects = g_Config.bSkipBufferEffects; @@ -1501,6 +1495,10 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) { draw->SetScissorRect(0, 0, g_display.pixel_xres, g_display.pixel_yres); } + Draw::BackendState state = draw->GetCurrentBackendState(); + // We allow if !state.valid, that means it's not the Vulkan backend. + _assert_msg_(!state.valid || state.passes >= 1, "skipB: %d sw: %d", (int)skipBufferEffects, (int)g_Config.bSoftwareRendering); + screenManager()->getUIContext()->BeginFrame(); if (!(mode & ScreenRenderMode::TOP)) {