gl_textures: Optimize the gl_nopartialtextureupdates 0 path to accumulate partial...

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 9a91c15536cd306582fb511081e0f44697fa3d19..982956b1bd942a22ef1016f61fe845390b57ccf6 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,3 +1,4 @@
+#include "darkplaces.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -10,10 +11,6 @@
 
 #ifdef __ANDROID__
 #include <android/log.h>
-
-#ifndef FNDELAY
-#define FNDELAY                O_NDELAY
-#endif
 #endif
 
 #include <signal.h>
@@ -27,8 +24,6 @@
 #endif
 #endif
 
-#include "quakedef.h"
-
 sys_t sys;
 
 // =======================================================================
@@ -41,13 +36,13 @@ void Sys_Shutdown (void)
        Sys_AllowProfiling(false);
 #endif
 #ifndef WIN32
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
        fflush(stdout);
        SDL_Quit();
 }
 
-static qboolean nocrashdialog;
+static qbool nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
        va_list argptr;
@@ -55,14 +50,14 @@ void Sys_Error (const char *error, ...)
 
 // change stdin to non blocking
 #ifndef WIN32
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
 
        va_start (argptr,error);
        dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
 
-       Con_Errorf ("Engine Error: %s\n", string);
+       Con_Printf(CON_ERROR "Engine Error: %s\n", string);
        
        if(!nocrashdialog)
                SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
@@ -81,12 +76,12 @@ void Sys_PrintToTerminal(const char *text)
 #else
        if(sys.outfd < 0)
                return;
-#ifdef FNDELAY
+#ifndef WIN32
        // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
        // this is because both go to /dev/tty by default!
        {
                int origflags = fcntl (sys.outfd, F_GETFL, 0);
-               fcntl (sys.outfd, F_SETFL, origflags & ~FNDELAY);
+               fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
 #endif
 #ifdef WIN32
 #define write _write
@@ -98,7 +93,7 @@ void Sys_PrintToTerminal(const char *text)
                                break; // sorry, I cannot do anything about this error - without an output
                        text += written;
                }
-#ifdef FNDELAY
+#ifndef WIN32
                fcntl (sys.outfd, F_SETFL, origflags);
        }
 #endif
@@ -206,30 +201,35 @@ int main (int argc, char *argv[])
        Sys_ProvideSelfFD();
 
        // COMMANDLINEOPTION: -nocrashdialog disables "Engine Error" crash dialog boxes
-       if(!COM_CheckParm("-nocrashdialog"))
+       if(!Sys_CheckParm("-nocrashdialog"))
                nocrashdialog = false;
        // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
-       if(COM_CheckParm("-noterminal"))
+       if(Sys_CheckParm("-noterminal"))
                sys.outfd = -1;
        // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
-       else if(COM_CheckParm("-stderr"))
+       else if(Sys_CheckParm("-stderr"))
                sys.outfd = 2;
        else
                sys.outfd = 1;
 
 #ifndef WIN32
-       fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
+       fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
 #endif
 
        // we don't know which systems we'll want to init, yet...
        SDL_Init(0);
 
+       // used by everything
+       Memory_Init();
+
        Host_Main();
 
+       Sys_Quit(0);
+       
        return 0;
 }
 
-qboolean sys_supportsdlgetticks = true;
+qbool sys_supportsdlgetticks = true;
 unsigned int Sys_SDL_GetTicks (void)
 {
        return SDL_GetTicks();