[Hgengine-cvs] SF.net SVN: hgengine:[527] Mercury2/src

[<axl...@us...>]

Revision: 527
          http://hgengine.svn.sourceforge.net/hgengine/?rev=527&view=rev
Author:   axlecrusher
Date:     2009-08-30 02:51:54 +0000 (Sun, 30 Aug 2009)

Log Message:
-----------
Fix windows compile

Modified Paths:
--------------
    Mercury2/src/MercuryLog.cpp
    Mercury2/src/MercuryNode.cpp
    Mercury2/src/MercuryNode.h
    Mercury2/src/MercuryThreads.h
    Mercury2/src/MercuryUtil.cpp
    Mercury2/src/MercuryUtil.h
    Mercury2/src/OGLExtensions.cpp
    Mercury2/src/OGLExtensions.h

Modified: Mercury2/src/MercuryLog.cpp
===================================================================
--- Mercury2/src/MercuryLog.cpp	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/MercuryLog.cpp	2009-08-30 02:51:54 UTC (rev 527)
@@ -11,7 +11,7 @@
 	{
 		log->CopyQueue();
 		log->WriteQueue();
-		usleep(100000); //10x/sec
+		msleep(100); //10x/sec
 	}
 }
 

Modified: Mercury2/src/MercuryNode.cpp
===================================================================
--- Mercury2/src/MercuryNode.cpp	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/MercuryNode.cpp	2009-08-30 02:51:54 UTC (rev 527)
@@ -393,8 +393,8 @@
 }
 
 bool MercuryNode::m_rebuildRenderGraph = false;
-__thread int g_iViewportID;
-__thread int g_iPass;
+__ThreadLocalStore int g_iViewportID;
+__ThreadLocalStore int g_iPass;
 
 
 /***************************************************************************

Modified: Mercury2/src/MercuryNode.h
===================================================================
--- Mercury2/src/MercuryNode.h	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/MercuryNode.h	2009-08-30 02:51:54 UTC (rev 527)
@@ -36,10 +36,10 @@
 #define DEFAULT_PASSES ( (1<<STANDARD_PASS) )
 
 ///The Global Viewport ID for this thread (to enable multi-threaded functioning for Viewports)
-extern __thread int g_iViewportID;
+extern __ThreadLocalStore int g_iViewportID;
 
 ///The Global Pass Number (which Pass is currently doing Render)
-extern __thread int g_iPass;
+extern __ThreadLocalStore int g_iPass;
 
 class MercuryNode : public MessageHandler
 {

Modified: Mercury2/src/MercuryThreads.h
===================================================================
--- Mercury2/src/MercuryThreads.h	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/MercuryThreads.h	2009-08-30 02:51:54 UTC (rev 527)
@@ -15,7 +15,10 @@
 #else
 #include <kernel.h>
 #endif
+#define __ThreadLocalStore __thread
 #else
+#include <WIndows.h>
+#define __ThreadLocalStore __declspec(thread)
 class StartThreadData;
 #endif
 

Modified: Mercury2/src/MercuryUtil.cpp
===================================================================
--- Mercury2/src/MercuryUtil.cpp	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/MercuryUtil.cpp	2009-08-30 02:51:54 UTC (rev 527)
@@ -4,6 +4,10 @@
 #include <MercuryVector.h>
 #include <MercuryBacktrace.h>
 
+#ifdef WIN32
+#include <Windows.h>
+#endif
+
 MString	ConvertToCFormat( const MString & ncf )
 {
 	MString ret;
@@ -273,11 +277,15 @@
 	}
 }
 
+void msleep(uint32_t msec)
+{
+#ifdef WIN32
+	Sleep(msec);
+#else
+	usleep(msec*1000);
+#endif
+}
 
-
-
-
-
 /* Copyright (c) 2009, Joshua Allen and Charles Lohr
  * All rights reserved.
  *

Modified: Mercury2/src/MercuryUtil.h
===================================================================
--- Mercury2/src/MercuryUtil.h	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/MercuryUtil.h	2009-08-30 02:51:54 UTC (rev 527)
@@ -131,6 +131,9 @@
 ///Convert a C-style formatted string into it's binary string equivalent.
 MString ConvertToUnformatted( const MString & cf );
 
+///millisecond sleep
+void msleep(uint32_t msec);
+
 #endif
 
 /* Copyright (c) 2009, Joshua Allen and Charles Lohr

Modified: Mercury2/src/OGLExtensions.cpp
===================================================================
--- Mercury2/src/OGLExtensions.cpp	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/OGLExtensions.cpp	2009-08-30 02:51:54 UTC (rev 527)
@@ -33,6 +33,7 @@
 PFNGLGETACTIVEUNIFORMARBPROC		glGetActiveUniformARB;
 PFNGLUNIFORM1IARBPROC				glUniform1iARB;
 PFNGLUNIFORM4FVARBPROC				glUniform4fvARB;
+PFNGLUNIFORM4IVARBPROC				glUniform4ivARB;
 
 PFNGLDELETEFRAMEBUFFERSEXTPROC		glDeleteFramebuffersEXT;
 PFNGLGENRENDERBUFFERSEXTPROC		glGenRenderbuffersEXT;

Modified: Mercury2/src/OGLExtensions.h
===================================================================
--- Mercury2/src/OGLExtensions.h	2009-08-28 20:44:26 UTC (rev 526)
+++ Mercury2/src/OGLExtensions.h	2009-08-30 02:51:54 UTC (rev 527)
@@ -28,6 +28,7 @@
 extern PFNGLGETACTIVEUNIFORMARBPROC		glGetActiveUniformARB;
 extern PFNGLUNIFORM1IARBPROC			glUniform1iARB;
 extern PFNGLUNIFORM4FVARBPROC			glUniform4fvARB;
+extern PFNGLUNIFORM4IVARBPROC			glUniform4ivARB;
 extern PFNGLUNIFORMMATRIX4FVARBPROC		glUniformMatrix4fvARB;
 
 extern PFNGLDELETEFRAMEBUFFERSEXTPROC	glDeleteFramebuffersEXT;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.