register the snd_streaming_length cvar

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 903bee1e6868edbe8363ea1791f2f5fdefccfcd8..bb6ce36bff76923f8f86178285578a92cfbdf061 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -1,12 +1,14 @@
+#ifdef WIN32
+# ifndef DONT_USE_SETDLLDIRECTORY
+#  define _WIN32_WINNT 0x0502
+# endif
+#endif
+
 #include "quakedef.h"
 
 #define SUPPORTDLL
 
 #ifdef WIN32
-# ifdef _WIN64
-#  define _WIN32_WINNT 0x0502
-   // for SetDllDirectory
-# endif
 # include <windows.h>
 # include <mmsystem.h> // timeGetTime
 # include <time.h> // localtime
@@ -131,13 +133,15 @@ notfound:
        {
                Con_DPrintf (" \"%s\"", dllnames[i]);
 #ifdef WIN32
-# ifdef _WIN64
+# ifndef DONT_USE_SETDLLDIRECTORY
+#  ifdef _WIN64
                SetDllDirectory("bin64");
+#  else
+               SetDllDirectory("bin32");
+#  endif
 # endif
                dllhandle = LoadLibrary (dllnames[i]);
-# ifdef _WIN64
-               SetDllDirectory(NULL);
-# endif
+               // no need to unset this - we want ALL dlls to be loaded from there, anyway
 #else
                dllhandle = dlopen (dllnames[i], RTLD_LAZY | RTLD_GLOBAL);
 #endif
@@ -232,8 +236,12 @@ void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
 # define HAVE_GETTIMEOFDAY 1
 #endif
 
-#ifdef FD_SET
-# define HAVE_SELECT 1
+#ifndef WIN32
+// on Win32, select() cannot be used with all three FD list args being NULL according to MSDN
+// (so much for POSIX...)
+# ifdef FD_SET
+#  define HAVE_SELECT 1
+# endif
 #endif
 
 #ifndef WIN32
@@ -255,7 +263,7 @@ static cvar_t sys_usequeryperformancecounter = {CVAR_SAVE, "sys_usequeryperforma
 static cvar_t sys_useclockgettime = {CVAR_SAVE, "sys_useclockgettime", "0", "use POSIX clock_gettime function (which has issues if the system clock speed is far off, as it can't get fixed by NTP) for timing rather than gettimeofday (which has issues if the system time is stepped by ntpdate, or apparently on some Xen installations)"};
 #endif
 
-static unsigned long benchmark_time;
+static double benchmark_time; // actually always contains an integer amount of milliseconds, will eventually "overflow"
 
 void Sys_Init_Commands (void)
 {
@@ -283,8 +291,11 @@ double Sys_DoubleTime(void)
        double newtime;
        if(sys_usenoclockbutbenchmark.integer)
        {
+               double old_benchmark_time = benchmark_time;
                benchmark_time += 1;
-               return ((double) benchmark_time) / 1e6;
+               if(benchmark_time == old_benchmark_time)
+                       Sys_Error("sys_usenoclockbutbenchmark cannot run any longer, sorry");
+               return benchmark_time * 0.000001;
        }
 
        // first all the OPTIONAL timers
@@ -409,7 +420,13 @@ void Sys_Sleep(int microseconds)
        double t = 0;
        if(sys_usenoclockbutbenchmark.integer)
        {
-               benchmark_time += microseconds;
+               if(microseconds)
+               {
+                       double old_benchmark_time = benchmark_time;
+                       benchmark_time += microseconds;
+                       if(benchmark_time == old_benchmark_time)
+                               Sys_Error("sys_usenoclockbutbenchmark cannot run any longer, sorry");
+               }
                return;
        }
        if(sys_debugsleep.integer)
@@ -504,3 +521,61 @@ void Sys_ProvideSelfFD(void)
                return;
        com_selffd = FS_SysOpenFD(Sys_FindExecutableName(), "rb", false);
 }
+
+// for x86 cpus only...  (x64 has SSE2_PRESENT)
+#if defined(SSE_POSSIBLE) && !defined(SSE2_PRESENT)
+// code from SDL, shortened as we can expect CPUID to work
+static int CPUID_Features(void)
+{
+       int features = 0;
+# if defined(__GNUC__) && defined(__i386__)
+        __asm__ (
+"        movl    %%ebx,%%edi\n"
+"        xorl    %%eax,%%eax                                           \n"
+"        incl    %%eax                                                 \n"
+"        cpuid                       # Get family/model/stepping/features\n"
+"        movl    %%edx,%0                                              \n"
+"        movl    %%edi,%%ebx\n"
+        : "=m" (features)
+        :
+        : "%eax", "%ecx", "%edx", "%edi"
+        );
+# elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+        __asm {
+        xor     eax, eax
+        inc     eax
+        cpuid                       ; Get family/model/stepping/features
+        mov     features, edx
+        }
+# else
+#  error SSE_POSSIBLE set but no CPUID implementation
+# endif
+       return features;
+}
+
+qboolean Sys_HaveSSE(void)
+{
+       // COMMANDLINEOPTION: SSE: -nosse disables SSE support and detection
+       if(COM_CheckParm("-nosse"))
+               return false;
+       // COMMANDLINEOPTION: SSE: -forcesse enables SSE support and disables detection
+       if(COM_CheckParm("-forcesse") || COM_CheckParm("-forcesse2"))
+               return true;
+       if(CPUID_Features() & (1 << 25))
+               return true;
+       return false;
+}
+
+qboolean Sys_HaveSSE2(void)
+{
+       // COMMANDLINEOPTION: SSE2: -nosse2 disables SSE2 support and detection
+       if(COM_CheckParm("-nosse") || COM_CheckParm("-nosse2"))
+               return false;
+       // COMMANDLINEOPTION: SSE2: -forcesse2 enables SSE2 support and disables detection
+       if(COM_CheckParm("-forcesse2"))
+               return true;
+       if((CPUID_Features() & (3 << 25)) == (3 << 25)) // SSE is 1<<25, SSE2 is 1<<26
+               return true;
+       return false;
+}
+#endif