Fix remnants of fog being applied to UIs

[xonotic/darkplaces.git] / zone.c

diff --git a/zone.c b/zone.c
index fe80693ce342fd08b9ac2171d8129f4212d76a2a..5a0c8987a0c3e2f184999aa0ed09e2ff46dc72bc 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -45,7 +45,7 @@ void *mem_mutex = NULL;
 # define FILE_BACKED_MALLOC 0
 #endif
 
-// LordHavoc: enables our own low-level allocator (instead of malloc)
+// LadyHavoc: enables our own low-level allocator (instead of malloc)
 #ifndef MEMCLUMPING
 # define MEMCLUMPING 0
 #endif
@@ -93,10 +93,11 @@ static memclump_t *clumpchain = NULL;
 #endif
 
 
-cvar_t developer_memory = {0, "developer_memory", "0", "prints debugging information about memory allocations"};
-cvar_t developer_memorydebug = {0, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"};
-cvar_t sys_memsize_physical = {CVAR_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"};
-cvar_t sys_memsize_virtual = {CVAR_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"};
+cvar_t developer_memory = {CVAR_CLIENT | CVAR_SERVER, "developer_memory", "0", "prints debugging information about memory allocations"};
+cvar_t developer_memorydebug = {CVAR_CLIENT | CVAR_SERVER, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"};
+cvar_t developer_memoryreportlargerthanmb = {CVAR_CLIENT | CVAR_SERVER, "developer_memorylargerthanmb", "16", "prints debugging information about memory allocations over this size"};
+cvar_t sys_memsize_physical = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"};
+cvar_t sys_memsize_virtual = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"};
 
 static mempool_t *poolchain = NULL;
 
@@ -390,21 +391,21 @@ void *_Mem_Alloc(mempool_t *pool, void *olddata, size_t size, size_t alignment,
        }
        if (mem_mutex)
                Thread_LockMutex(mem_mutex);
-       if (developer_memory.integer)
-               Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, (int)size);
+       if (developer_memory.integer || size >= developer_memoryreportlargerthanmb.value * 1048576)
+               Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %f bytes (%f MB)\n", pool->name, filename, fileline, (double)size, (double)size / 1048576.0f);
        //if (developer.integer > 0 && developer_memorydebug.integer)
        //      _Mem_CheckSentinelsGlobal(filename, fileline);
        pool->totalsize += size;
        realsize = alignment + sizeof(memheader_t) + size + sizeof(sentinel2);
        pool->realsize += realsize;
        base = (unsigned char *)Clump_AllocBlock(realsize);
-       if (base== NULL)
+       if (base == NULL)
        {
                Mem_PrintList(0);
                Mem_PrintStats();
                Mem_PrintList(1<<30);
                Mem_PrintStats();
-               Sys_Error("Mem_Alloc: out of memory (alloc at %s:%i)", filename, fileline);
+               Sys_Error("Mem_Alloc: out of memory (alloc of size %f (%.3fMB) at %s:%i)", (double)realsize, (double)realsize / (1 << 20), filename, fileline);
        }
        // calculate address that aligns the end of the memheader_t to the specified alignment
        mem = (memheader_t*)((((size_t)base + sizeof(memheader_t) + (alignment-1)) & ~(alignment-1)) - sizeof(memheader_t));
@@ -844,16 +845,16 @@ void Mem_PrintList(size_t minallocationsize)
        }
 }
 
-static void MemList_f(void)
+static void MemList_f(cmd_state_t *cmd)
 {
-       switch(Cmd_Argc())
+       switch(Cmd_Argc(cmd))
        {
        case 1:
                Mem_PrintList(1<<30);
                Mem_PrintStats();
                break;
        case 2:
-               Mem_PrintList(atoi(Cmd_Argv(1)) * 1024);
+               Mem_PrintList(atoi(Cmd_Argv(cmd, 1)) * 1024);
                Mem_PrintStats();
                break;
        default:
@@ -862,7 +863,7 @@ static void MemList_f(void)
        }
 }
 
-static void MemStats_f(void)
+static void MemStats_f(cmd_state_t *cmd)
 {
        Mem_CheckSentinelsGlobal();
        R_TextureStats_Print(false, false, true);
@@ -915,10 +916,12 @@ void Memory_Shutdown (void)
 
 void Memory_Init_Commands (void)
 {
-       Cmd_AddCommand ("memstats", MemStats_f, "prints memory system statistics");
-       Cmd_AddCommand ("memlist", MemList_f, "prints memory pool information (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)");
+       Cmd_AddCommand(CMD_SHARED, "memstats", MemStats_f, "prints memory system statistics");
+       Cmd_AddCommand(CMD_SHARED, "memlist", MemList_f, "prints memory pool information (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)");
+
        Cvar_RegisterVariable (&developer_memory);
        Cvar_RegisterVariable (&developer_memorydebug);
+       Cvar_RegisterVariable (&developer_memoryreportlargerthanmb);
        Cvar_RegisterVariable (&sys_memsize_physical);
        Cvar_RegisterVariable (&sys_memsize_virtual);