Removing the last of XEDECLARECLASS.

src/xenia/gpu/gpu.h

@@ -12,14 +12,13 @@
 
 #include <xenia/gpu/graphics_system.h>
 
-
-XEDECLARECLASS1(xe, Emulator);
-
+namespace xe {
+class Emulator;
+}  // namespace xe
 
 namespace xe {
 namespace gpu {
 
-
 GraphicsSystem* Create(Emulator* emulator);
 
 GraphicsSystem* CreateNop(Emulator* emulator);
@@ -28,9 +27,7 @@ GraphicsSystem* CreateNop(Emulator* emulator);
 GraphicsSystem* CreateD3D11(Emulator* emulator);
 #endif  // WIN32
 
-
 }  // namespace gpu
 }  // namespace xe
 
-
 #endif  // XENIA_GPU_GPU_H_

src/xenia/gpu/graphics_system.h

@@ -14,22 +14,17 @@
 #include <thread>
 
 #include <xenia/core.h>
+#include <xenia/emulator.h>
 #include <xenia/xbox.h>
 
-
-XEDECLARECLASS1(xe, Emulator);
-XEDECLARECLASS2(xe, cpu, Processor);
-
-
 namespace xe {
 namespace gpu {
 
 class CommandProcessor;
 class GraphicsDriver;
 
-
 class GraphicsSystem {
-public:
+ public:
   virtual ~GraphicsSystem();
 
   Emulator* emulator() const { return emulator_; }
@@ -50,11 +45,11 @@ public:
   void DispatchInterruptCallback(uint32_t source, uint32_t cpu = 0xFFFFFFFF);
   virtual void Swap() = 0;
 
-protected:
+ protected:
   virtual void Initialize();
   virtual void Pump() = 0;
 
-private:
+ private:
   void ThreadStart();
 
   static uint64_t MMIOReadRegisterThunk(GraphicsSystem* gs, uint64_t addr) {
@@ -65,28 +60,26 @@ private:
     gs->WriteRegister(addr, value);
   }
 
-protected:
+ protected:
   GraphicsSystem(Emulator* emulator);
 
-  Emulator*         emulator_;
-  Memory*           memory_;
-  cpu::Processor*   processor_;
+  Emulator* emulator_;
+  Memory* memory_;
+  cpu::Processor* processor_;
 
-  xe_run_loop_ref   run_loop_;
-  std::thread       thread_;
+  xe_run_loop_ref run_loop_;
+  std::thread thread_;
   std::atomic<bool> running_;
 
-  GraphicsDriver*   driver_;
+  GraphicsDriver* driver_;
   CommandProcessor* command_processor_;
 
-  uint32_t          interrupt_callback_;
-  uint32_t          interrupt_callback_data_;
-  HANDLE            thread_wait_;
+  uint32_t interrupt_callback_;
+  uint32_t interrupt_callback_data_;
+  HANDLE thread_wait_;
 };
 
-
 }  // namespace gpu
 }  // namespace xe
 
-
 #endif  // XENIA_GPU_GRAPHICS_SYSTEM_H_

src/xenia/gpu/nop/nop_gpu.h

@@ -12,22 +12,19 @@
 
 #include <xenia/core.h>
 
-
-XEDECLARECLASS1(xe, Emulator);
-XEDECLARECLASS2(xe, gpu, GraphicsSystem);
-
+namespace xe {
+class Emulator;
+}  // namespace xe
 
 namespace xe {
 namespace gpu {
+class GraphicsSystem;
 namespace nop {
 
-
 GraphicsSystem* Create(Emulator* emulator);
 
-
 }  // namespace nop
 }  // namespace gpu
 }  // namespace xe
 
-
 #endif  // XENIA_GPU_NOP_NOP_GPU_H_