From 8e568857959291f442ba8f11abac059b6bd6a9e9 Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Sat, 31 Dec 2011 01:06:04 +0100
Subject: initial commit of the threaded graphics. can start game and render
 the gui. no textures at the moment. still waits for the swap for now

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

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

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 4107cd85..bb888c60 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1689,28 +1689,21 @@ void CClient::InitInterfaces()
 	m_Friends.Init();
 }
 
-
-enum
+void CClient::Run()
 {
-	GFXSTATE_ERROR = -1,
-	GFXSTATE_INIT = 0,
-	GFXSTATE_IDLE,
-	GFXSTATE_RENDERING,
-	GFXSTATE_SWAPPING,
-};
+	int64 ReportTime = time_get();
+	int64 ReportInterval = time_freq()*1;
+
+	m_LocalStartTime = time_get();
+	m_SnapshotParts = 0;
 
-void CClient::GraphicsThread()
-{
 	// init graphics
 	if(m_pGraphics->Init() != 0)
 	{
-		m_GfxState = GFXSTATE_ERROR;
-		m_GfxStateSemaphore.signal();
-		m_GfxState = GFXSTATE_ERROR;
+		dbg_msg("client", "couldn't init graphics");
 		return;
 	}
 
-
 	// open socket
 	{
 		NETADDR BindAddr;
@@ -1719,7 +1712,6 @@ void CClient::GraphicsThread()
 		if(!m_NetClient.Open(BindAddr, 0))
 		{
 			dbg_msg("client", "couldn't start network");
-			m_GfxState = GFXSTATE_ERROR;
 			return;
 		}
 	}
@@ -1741,59 +1733,10 @@ void CClient::GraphicsThread()
 
 	// 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);
@@ -1910,26 +1853,6 @@ void CClient::Run()
 
 			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)
@@ -1942,7 +1865,7 @@ void CClient::Run()
 			{
 				Render();
 				m_pGraphics->Swap();
-			}*/
+			}
 		}
 
 		AutoScreenshot_Cleanup();
-- 
cgit 1.4.1