spearmint: Provide better zone debug messages from renderer

Jenco420 · Aug 6, 2017 · cc46702 · cc46702
1 parent 303be6a
commit cc46702
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
@@ -3109,13 +3109,23 @@ void Com_ReadFromPipe( void )
 Com_RefMalloc
 ============
 */
+#ifdef ZONE_DEBUG
+void *Com_RefMalloc( int size, char *label, char *file, int line ) {
+	return Z_TagMallocDebug( size, TAG_RENDERER, label, file, line );
+}
+
+void Com_RefFree( void *pointer, char *label, char *file, int line ) {
+	Z_FreeDebug( pointer, label, file, line );
+}
+#else
 void *Com_RefMalloc( int size ) {
 	return Z_TagMalloc( size, TAG_RENDERER );
 }
 
 void Com_RefFree( void *pointer ) {
 	Z_Free( pointer );
 }
+#endif
 
 int Com_ScaledMilliseconds(void) {
 	return Sys_Milliseconds()*com_timescale->value;
@@ -3232,8 +3242,13 @@ void Com_InitRef( refimport_t *ri ) {
 	ri->Printf = Com_RefPrintf;
 	ri->Error = Com_Error;
 	ri->Milliseconds = Com_ScaledMilliseconds;
+#ifdef ZONE_DEBUG
+	ri->MallocDebug = Com_RefMalloc;
+	ri->FreeDebug = Com_RefFree;
+#else
 	ri->Malloc = Com_RefMalloc;
 	ri->Free = Com_RefFree;
+#endif
 #ifdef HUNK_DEBUG
 	ri->Hunk_AllocDebug = Hunk_AllocDebug;
 #else

diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
@@ -257,6 +257,10 @@ typedef enum {
 } errorParm_t;
 
 
+#if !defined(NDEBUG) && !defined(BSPC)
+	#define ZONE_DEBUG
+#endif
+
 #if !defined(NDEBUG) && !defined(BSPC)
 	#define HUNK_DEBUG
 #endif

diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
@@ -1060,10 +1060,6 @@ temp file loading
 
 */
 
-#if !defined(NDEBUG) && !defined(BSPC)
-	#define ZONE_DEBUG
-#endif
-
 #ifdef ZONE_DEBUG
 #define Z_TagMalloc(size, tag)			Z_TagMallocDebug(size, tag, #size, __FILE__, __LINE__)
 #define Z_Malloc(size)					Z_MallocDebug(size, #size, __FILE__, __LINE__)

diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
@@ -162,9 +162,17 @@ typedef struct {
 	void	*(*Hunk_AllocateTempMemory)( int size );
 	void	(*Hunk_FreeTempMemory)( void *block );
 
+#ifdef ZONE_DEBUG
+#define Malloc(size)					MallocDebug(size, #size, __FILE__, __LINE__)
+#define Free(ptr)						FreeDebug(ptr, #ptr, __FILE__, __LINE__)
+	// dynamic memory allocator for things that need to be freed
+	void	*(*MallocDebug)( int bytes, char *label, char *file, int line );
+	void	(*FreeDebug)( void *buf, char *label, char *file, int line );
+#else
 	// dynamic memory allocator for things that need to be freed
 	void	*(*Malloc)( int bytes );
 	void	(*Free)( void *buf );
+#endif
 
 	cvar_t	*(*Cvar_Get)( const char *name, const char *value, int flags );
 	cvar_t	*(*Cvar_Set)( const char *name, const char *value );