Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform

# Conflicts:
#	src/frontend/qt_sdl/CMakeLists.txt
#	src/frontend/qt_sdl/Platform.cpp
#	src/frontend/qt_sdl/main.cpp

1 files changed, 32 insertions, 2 deletions

diff --git a/src/GPU.h b/src/GPU.h
index 661a7d9..039e065 100644
--- a/src/GPU.h
+++ b/src/GPU.h
@@ -20,7 +20,6 @@
 #define GPU_H
 
 #include "GPU2D.h"
-#include "GPU3D.h"
 
 namespace GPU
 {
@@ -72,6 +71,17 @@ extern u32* Framebuffer[2][2];
 extern GPU2D* GPU2D_A;
 extern GPU2D* GPU2D_B;
 
+extern int Renderer;
+
+
+typedef struct
+{
+    bool Soft_Threaded;
+
+    int GL_ScaleFactor;
+
+} RenderSettings;
+
 
 bool Init();
 void DeInit();
@@ -80,7 +90,11 @@ void Stop();
 
 void DoSavestate(Savestate* file);
 
-void SetDisplaySettings(bool accel);
+void InitRenderer(int renderer);
+void DeInitRenderer();
+void ResetRenderer();
+
+void SetRenderSettings(int renderer, RenderSettings& settings);
 
 
 u8* GetUniqueBankPtr(u32 mask, u32 offset);
@@ -422,6 +436,22 @@ void SetDispStat(u32 cpu, u16 val);
 
 void SetVCount(u16 val);
 
+namespace GLCompositor
+{
+
+bool Init();
+void DeInit();
+void Reset();
+
+void SetRenderSettings(RenderSettings& settings);
+
+void RenderFrame();
+void BindOutputTexture();
+
+}
+
 }
 
+#include "GPU3D.h"
+
 #endif