fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing dependencies on MainWindow.

Browse Source
This commit is contained in:
Ben Vanik
2015-07-01 08:02:22 -07:00
parent 4732378ba9
commit 9efccc5f4a
17 changed files with 123 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/xenia/gpu/graphics_system.h
View File

@@ -16,7 +16,8 @@
#include "xenia/cpu/processor.h"
#include "xenia/memory.h"
#include "xenia/ui/main_window.h"
#include "xenia/ui/loop.h"
#include "xenia/ui/platform.h"
#include "xenia/xbox.h"
namespace xe {
@@ -36,8 +37,7 @@ class GraphicsSystem {
Memory* memory() const { return memory_; }
cpu::Processor* processor() const { return processor_; }
virtual X_STATUS Setup(cpu::Processor* processor,
ui::PlatformLoop* target_loop,
virtual X_STATUS Setup(cpu::Processor* processor, ui::Loop* target_loop,
ui::PlatformWindow* target_window);
virtual void Shutdown();
@@ -64,14 +64,14 @@ class GraphicsSystem {
protected:
GraphicsSystem(Emulator* emulator);
Emulator* emulator_;
Memory* memory_;
cpu::Processor* processor_;
ui::PlatformLoop* target_loop_;
ui::PlatformWindow* target_window_;
Emulator* emulator_ = nullptr;
Memory* memory_ = nullptr;
cpu::Processor* processor_ = nullptr;
ui::Loop* target_loop_ = nullptr;
ui::PlatformWindow* target_window_ = nullptr;
uint32_t interrupt_callback_;
uint32_t interrupt_callback_data_;
uint32_t interrupt_callback_ = 0;
uint32_t interrupt_callback_data_ = 0;
};
} // namespace gpu