Merge branch 'master' into fast-forward-hotkey

1 files changed, 26 insertions, 2 deletions

diff --git a/src/GPU3D.h b/src/GPU3D.h
index 279494a..4e7c01a 100644
--- a/src/GPU3D.h
+++ b/src/GPU3D.h
@@ -39,6 +39,10 @@ typedef struct
     s32 FinalPosition[2];
     s32 FinalColor[3];
 
+    // hi-res position (4-bit fractional part)
+    // TODO maybe: hi-res color? (that survives clipping)
+    s32 HiresPosition[2];
+
 } Vertex;
 
 typedef struct
@@ -86,6 +90,8 @@ extern u32 RenderNumPolygons;
 
 extern u64 Timestamp;
 
+extern int Renderer;
+
 bool Init();
 void DeInit();
 void Reset();
@@ -94,6 +100,10 @@ void DoSavestate(Savestate* file);
 
 void SetEnabled(bool geometry, bool rendering);
 
+int InitRenderer(bool hasGL);
+void DeInitRenderer();
+void UpdateRendererConfig();
+
 void ExecuteCommand();
 
 s32 CyclesToRunFor();
@@ -104,7 +114,6 @@ void CheckFIFODMA();
 void VCount144();
 void VBlank();
 void VCount215();
-void RequestLine(int line);
 u32* GetLine(int line);
 
 void WriteToGXFIFO(u32 val);
@@ -127,11 +136,26 @@ void SetupRenderThread();
 
 void VCount144();
 void RenderFrame();
-void RequestLine(int line);
 u32* GetLine(int line);
 
 }
 
+namespace GLRenderer
+{
+
+bool Init();
+void DeInit();
+void Reset();
+
+void UpdateDisplaySettings();
+
+void RenderFrame();
+void PrepareCaptureFrame();
+u32* GetLine(int line);
+void SetupAccelFrame();
+
+}
+
 }
 
 #endif