1 files changed, 12 insertions, 20 deletions
diff --git a/src/GPU.h b/src/GPU.h
index 2fc15f4..1e24051 100644
--- a/src/GPU.h
+++ b/src/GPU.h
@@ -19,9 +19,15 @@
 #ifndef GPU_H
 #define GPU_H
 
+#include <memory>
+
 #include "GPU2D.h"
 #include "NonStupidBitfield.h"
 
+#ifdef OGLRENDERER_ENABLED
+#include "GPU_OpenGL.h"
+#endif
+
 namespace GPU
 {
 
@@ -69,8 +75,8 @@ extern u8* VRAMPtr_BOBJ[0x8];
 extern int FrontBuffer;
 extern u32* Framebuffer[2][2];
 
-extern GPU2D* GPU2D_A;
-extern GPU2D* GPU2D_B;
+extern std::unique_ptr<GPU2D> GPU2D_A;
+extern std::unique_ptr<GPU2D> GPU2D_B;
 
 extern int Renderer;
 
@@ -149,6 +155,10 @@ void SyncDirtyFlags();
 extern u32 OAMDirty;
 extern u32 PaletteDirty;
 
+#ifdef OGLRENDERER_ENABLED
+extern std::unique_ptr<GLCompositor> CurGLCompositor;
+#endif
+
 struct RenderSettings
 {
     bool Soft_Threaded;
@@ -550,24 +560,6 @@ void DisplayFIFO(u32 x);
 void SetDispStat(u32 cpu, u16 val);
 
 void SetVCount(u16 val);
-
-#ifdef OGLRENDERER_ENABLED
-namespace GLCompositor
-{
-
-bool Init();
-void DeInit();
-void Reset();
-
-void SetRenderSettings(RenderSettings& settings);
-
-void Stop();
-void RenderFrame();
-void BindOutputTexture(int buf);
-
-}
-#endif
-
 }
 
 #include "GPU3D.h"