From ad92865497f83fe4c19cd9ab78cce9da1a8c3a6c Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Fri, 3 Apr 2020 11:58:43 -0400
Subject: General: Correct rebase, sync gpu and context management.
---
src/core/cpu_manager.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
(limited to 'src/core/cpu_manager.cpp')
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index b7c2a78322..63c5788520 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -9,12 +9,12 @@
#include "core/core.h"
#include "core/core_timing.h"
#include "core/cpu_manager.h"
-#include "core/frontend/emu_window.h"
#include "core/gdbstub/gdbstub.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/physical_core.h"
#include "core/hle/kernel/scheduler.h"
#include "core/hle/kernel/thread.h"
+#include "video_core/gpu.h"
namespace Core {
@@ -25,10 +25,6 @@ void CpuManager::ThreadStart(CpuManager& cpu_manager, std::size_t core) {
cpu_manager.RunThread(core);
}
-void CpuManager::SetRenderWindow(Core::Frontend::EmuWindow& render_window) {
- this->render_window = &render_window;
-}
-
void CpuManager::Initialize() {
running_mode = true;
if (is_multicore) {
@@ -354,7 +350,7 @@ void CpuManager::RunThread(std::size_t core) {
data.is_running = false;
data.enter_barrier->Wait();
if (sc_sync_first_use) {
- render_window->MakeCurrent();
+ system.GPU().ObtainContext();
sc_sync_first_use = false;
}
auto& scheduler = system.Kernel().CurrentScheduler();
@@ -366,9 +362,6 @@ void CpuManager::RunThread(std::size_t core) {
data.exit_barrier->Wait();
data.is_paused = false;
}
- if (sc_sync) {
- render_window->DoneCurrent();
- }
/// Time to cleanup
data.host_context->Exit();
data.enter_barrier.reset();
--
cgit v1.2.3-70-g09d2