It renders something, crashes because ImGui exhausts the display list. Need to find a better way for thread sync. Message queue?

This commit is contained in:
irisz64
2025-05-22 09:16:58 +02:00
parent 668edbcd91
commit 326b4b43cd
7 changed files with 25 additions and 43 deletions

View File

@@ -3,10 +3,12 @@
#include <KaizenGui.hpp>
EmuThread::EmuThread(const std::shared_ptr<n64::Core> &core, double &fps, RenderWidget &renderWidget,
SettingsWindow &settings, KaizenGui& kaizenGui) noexcept :
SettingsWindow &settings) noexcept :
renderWidget(renderWidget), core(core), settings(settings), fps(fps) {
thread = std::thread([&]() {
core->parallel.Init(renderWidget.wsiPlatform, renderWidget.windowInfo, core->cpu->GetMem().GetRDRAMPtr());
parallelRDPInitialized = true;
isRunning = true;
auto lastSample = std::chrono::high_resolution_clock::now();
@@ -18,26 +20,8 @@ EmuThread::EmuThread(const std::shared_ptr<n64::Core> &core, double &fps, Render
while (!interruptionRequested) {
if(!started) {
const auto startFrameTime = std::chrono::high_resolution_clock::now();
core->parallel.UpdateScreen(core->cpu->GetMem().mmio.vi, kaizenGui, false);
const auto endFrameTime = std::chrono::high_resolution_clock::now();
using namespace std::chrono_literals;
const auto frameTimeMs = std::chrono::duration<double>(endFrameTime - startFrameTime) / 1ms;
avgFps += frameTimeMs;
sampledFps++;
if (const auto elapsedSinceLastSample = std::chrono::duration<double>(endFrameTime - lastSample) / 1s;
elapsedSinceLastSample >= 1.0) {
if (!oneSecondPassed) {
oneSecondPassed = true;
continue;
}
lastSample = endFrameTime;
avgFps /= sampledFps;
sampledFps = 0;
fps = 1000.0 / avgFps;
}
core->parallel.UpdateScreen(core->cpu->GetMem().mmio.vi, false);
fps = -1.0;
continue;
}
@@ -50,7 +34,7 @@ EmuThread::EmuThread(const std::shared_ptr<n64::Core> &core, double &fps, Render
}
if (core->render) {
core->parallel.UpdateScreen(core->cpu->GetMem().mmio.vi, kaizenGui);
core->parallel.UpdateScreen(core->cpu->GetMem().mmio.vi);
}
const auto endFrameTime = std::chrono::high_resolution_clock::now();

View File

@@ -8,13 +8,11 @@ namespace n64 {
struct Core;
}
class KaizenGui;
class EmuThread final {
RenderWidget &renderWidget;
bool started = false;
public:
explicit EmuThread(const std::shared_ptr<n64::Core> &, double &, RenderWidget &, SettingsWindow &, KaizenGui&) noexcept;
explicit EmuThread(const std::shared_ptr<n64::Core> &, double &, RenderWidget &, SettingsWindow &) noexcept;
void start() noexcept;
void TogglePause() const noexcept;
@@ -23,7 +21,7 @@ public:
void Stop() const noexcept;
void requestInterruption() { interruptionRequested = true; }
bool interruptionRequested = false, isRunning = false;
bool interruptionRequested = false, isRunning = false, parallelRDPInitialized = false;
std::shared_ptr<n64::Core> core;
SettingsWindow &settings;
double& fps;

View File

@@ -6,8 +6,6 @@
#include <utils/log.hpp>
#include <memory>
class KaizenGui;
namespace gui {
static VkAllocationCallbacks* g_Allocator = NULL;
static VkInstance g_Instance = VK_NULL_HANDLE;
@@ -151,7 +149,5 @@ namespace gui {
inline void EndFrame() {
ImGui::Render();
auto cmd = g_Wsi->get_device().request_command_buffer();
ImGui_ImplVulkan_RenderDrawData(ImGui::GetDrawData(), cmd->get_command_buffer());
}
}

View File

@@ -4,8 +4,8 @@
#include <ImGuiImpl/StatusBar.hpp>
#include <ImGuiImpl/GUI.hpp>
KaizenGui::KaizenGui() noexcept : window("Kaizen", 1280, 720), core(std::make_shared<n64::Core>()), vulkanWidget(core, window.getHandle()), emuThread(core, fpsCounter, vulkanWidget, settingsWindow, *this) {
core->parallel.Init(vulkanWidget.wsiPlatform, vulkanWidget.windowInfo, core->cpu->GetMem().GetRDRAMPtr());
KaizenGui::KaizenGui() noexcept : window("Kaizen", 1280, 720), core(std::make_shared<n64::Core>()), vulkanWidget(core, window.getHandle()), emuThread(core, fpsCounter, vulkanWidget, settingsWindow) {
while(!emuThread.parallelRDPInitialized);
gui::Initialize(core->parallel.wsi, window.getHandle());
emuExitFunc = [&]() {
@@ -27,7 +27,8 @@ KaizenGui::KaizenGui() noexcept : window("Kaizen", 1280, 720), core(std::make_sh
});
statusBar.setFunc([&]() {
ImGui::Text("GUI FPS: %.2f, Emulation FPS: %.2f", ImGui::GetIO().Framerate, fpsCounter);
ImGui::Text("GUI FPS: %.2f, Emulation FPS: %s", ImGui::GetIO().Framerate,
fmt::format(fpsCounter > 0 ? fmt::runtime("{:.2f{0}}") : fmt::runtime("{1}"), fpsCounter, "Not playing").c_str());
});
menuBar.addMenu({"File",
@@ -102,6 +103,8 @@ void KaizenGui::handleEvents() {
int KaizenGui::run() {
while(!quit) {
handleEvents();
RenderUI();
}
return 0;

View File

@@ -20,7 +20,6 @@ public:
EmuThread emuThread;
gui::PopupWindow about{"About Kaizen"};
gui::StatusBar statusBar{};
void RenderUI();
int run();
void LoadTAS(const std::string &path) const noexcept;
@@ -29,4 +28,5 @@ private:
bool quit = false;
void handleEvents();
std::function<void()> emuExitFunc;
void RenderUI();
};