From 1fb7242bcaf4ab9f47253b8c41288a4a39b12ba1 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 12 Nov 2009 10:36:34 +0000 Subject: [PATCH] disable dynamic viewcache until bugs are fixed git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9472 d7cf8633-e32d-0410-b094-e92efae38249 --- client.h | 8 ++++++++ gl_rmain.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/client.h b/client.h index ac5e866d..94253214 100644 --- a/client.h +++ b/client.h @@ -1555,6 +1555,7 @@ r_refdef_view_t; typedef struct r_refdef_viewcache_s { +#ifdef VIEWCACHEDYNAMIC // updated by gl_main_newmap() int maxentities; int world_numclusters; @@ -1574,6 +1575,13 @@ typedef struct r_refdef_viewcache_s unsigned char *world_surfacevisible; // if true, the view is currently in a leaf without pvs data qboolean world_novis; +#else + unsigned char entityvisible[MAX_EDICTS+512+256]; + unsigned char world_pvsbits[8192]; + unsigned char world_leafvisible[65536]; + unsigned char world_surfacevisible[262144]; + qboolean world_novis; +#endif } r_refdef_viewcache_t; diff --git a/gl_rmain.c b/gl_rmain.c index 92a5915e..1556b95b 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -2856,6 +2856,7 @@ skinframe_t *R_SkinFrame_LoadMissing(void) void R_Main_FreeViewCache(void) { +#ifdef VIEWCACHEDYNAMIC if (r_refdef.viewcache.entityvisible) Mem_Free(r_refdef.viewcache.entityvisible); if (r_refdef.viewcache.world_pvsbits) @@ -2865,10 +2866,12 @@ void R_Main_FreeViewCache(void) if (r_refdef.viewcache.world_surfacevisible) Mem_Free(r_refdef.viewcache.world_surfacevisible); memset(&r_refdef.viewcache, 0, sizeof(r_refdef.viewcache)); +#endif } void R_Main_AllocViewCache(void) { +#ifdef VIEWCACHEDYNAMIC memset(&r_refdef.viewcache, 0, sizeof(r_refdef.viewcache)); r_refdef.viewcache.maxentities = r_refdef.scene.maxentities; if (r_refdef.viewcache.maxentities) @@ -2882,6 +2885,7 @@ void R_Main_AllocViewCache(void) r_refdef.viewcache.world_leafvisible = Mem_Alloc(r_main_mempool, r_refdef.viewcache.world_numleafs); r_refdef.viewcache.world_surfacevisible = Mem_Alloc(r_main_mempool, r_refdef.viewcache.world_numsurfaces); } +#endif } void gl_main_start(void) -- 2.39.2