From 8ffe5826156d07b1feb7fc58bf59a1431e01160f Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Fri, 30 Dec 2011 16:02:22 +0100
Subject: ugly incomplete hack to put the rendering into another thread so we
 don't have to wait for the flip

---
 src/engine/client/client.cpp | 98 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 90 insertions(+), 8 deletions(-)

(limited to 'src/engine/client/client.cpp')

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 9f43b9ce..4107cd85 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -7,6 +7,7 @@
 
 #include <base/math.h>
 #include <base/system.h>
+#include <base/tl/threading.h>
 
 #include <engine/client.h>
 #include <engine/config.h>
@@ -1688,17 +1689,27 @@ void CClient::InitInterfaces()
 	m_Friends.Init();
 }
 
-void CClient::Run()
-{
-	int64 ReportTime = time_get();
-	int64 ReportInterval = time_freq()*1;
 
-	m_LocalStartTime = time_get();
-	m_SnapshotParts = 0;
+enum
+{
+	GFXSTATE_ERROR = -1,
+	GFXSTATE_INIT = 0,
+	GFXSTATE_IDLE,
+	GFXSTATE_RENDERING,
+	GFXSTATE_SWAPPING,
+};
 
+void CClient::GraphicsThread()
+{
 	// init graphics
 	if(m_pGraphics->Init() != 0)
+	{
+		m_GfxState = GFXSTATE_ERROR;
+		m_GfxStateSemaphore.signal();
+		m_GfxState = GFXSTATE_ERROR;
 		return;
+	}
+
 
 	// open socket
 	{
@@ -1708,6 +1719,7 @@ void CClient::Run()
 		if(!m_NetClient.Open(BindAddr, 0))
 		{
 			dbg_msg("client", "couldn't start network");
+			m_GfxState = GFXSTATE_ERROR;
 			return;
 		}
 	}
@@ -1722,16 +1734,66 @@ void CClient::Run()
 	MasterServer()->RefreshAddresses(m_NetClient.NetType());
 
 	// init the editor
-	m_pEditor->Init();
+	//m_pEditor->Init();
 
 	// init sound, allowed to fail
 	m_SoundInitFailed = Sound()->Init() != 0;
 
 	// load data
 	if(!LoadData())
+	{
+		m_GfxState = GFXSTATE_ERROR;
 		return;
+	}
 
 	GameClient()->OnInit();
+
+
+	while(1)
+	{
+		// do idle
+		sync_barrier();
+		m_GfxState = GFXSTATE_IDLE;
+		m_GfxStateSemaphore.signal();
+		m_GfxRenderSemaphore.wait();
+		
+		// do render
+		m_GfxState = GFXSTATE_RENDERING;
+		m_GfxStateSemaphore.signal();
+		Render();
+		sync_barrier();
+
+		// do swap
+		m_GfxState = GFXSTATE_SWAPPING;
+		m_GfxStateSemaphore.signal();
+		m_pGraphics->Swap();
+	}
+
+	// do shutdown
+}
+
+void CClient::Run()
+{
+	int64 ReportTime = time_get();
+	int64 ReportInterval = time_freq()*1;
+
+	m_LocalStartTime = time_get();
+	m_SnapshotParts = 0;
+
+	m_GfxState = GFXSTATE_INIT;
+	thread_create(GraphicsThreadProxy, this);
+
+	// wait for gfx to init
+	while(1)
+	{
+		m_GfxStateSemaphore.wait();
+		if(m_GfxState == GFXSTATE_ERROR)
+			return;
+		if(m_GfxState != GFXSTATE_INIT)
+			break;
+	}
+
+
 	char aBuf[256];
 	str_format(aBuf, sizeof(aBuf), "version %s", GameClient()->NetVersion());
 	m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "client", aBuf);
@@ -1847,7 +1909,27 @@ void CClient::Run()
 				m_EditorActive = false;
 
 			Update();
+			
+
+			if(m_GfxState == GFXSTATE_IDLE)
+			{
+				// issue new rendering
+				m_GfxRenderSemaphore.signal();
+
+				// wait for gfx to finish rendering
+				while(m_GfxState != GFXSTATE_SWAPPING)
+					m_GfxStateSemaphore.wait();
 
+			}
+
+			/*
+			if(m_pGraphics->AsyncSwapIsDone())
+			{
+				m_pGraphics->BeginScene();
+				Render();
+				m_pGraphics->EndScene();
+			}*/
+			/*
 			if(g_Config.m_DbgStress)
 			{
 				if((m_Frames%10) == 0)
@@ -1860,7 +1942,7 @@ void CClient::Run()
 			{
 				Render();
 				m_pGraphics->Swap();
-			}
+			}*/
 		}
 
 		AutoScreenshot_Cleanup();
-- 
cgit 1.4.1