separate handling of num_pvsclusterbytes in ViewCache code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9480 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/client.h b/client.h
index ac5e866d4eae26906eb85fc99e2910dd8d859250..9025c88144ae795ba9ebf01c302ec24ae971ae93 100644 (file)
--- a/client.h
+++ b/client.h
@@ -1558,6 +1558,7 @@ typedef struct r_refdef_viewcache_s
        // updated by gl_main_newmap()
        int maxentities;
        int world_numclusters;
+       int world_numclusterbytes;
        int world_numleafs;
        int world_numsurfaces;
 

diff --git a/gl_rmain.c b/gl_rmain.c
index 48334387371277aaf8beda1da6d2e0d51d3c4248..7a216456969558cdf5979a63a78fafecdf9266fc 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2872,6 +2872,7 @@ void R_Main_ResizeViewCache(void)
 {
        int numentities = r_refdef.scene.numentities;
        int numclusters = r_refdef.scene.worldmodel ? r_refdef.scene.worldmodel->brush.num_pvsclusters : 1;
+       int numclusterbytes = r_refdef.scene.worldmodel ? r_refdef.scene.worldmodel->brush.num_pvsclusterbytes : 1
        int numleafs = r_refdef.scene.worldmodel ? r_refdef.scene.worldmodel->brush.num_leafs : 1;
        int numsurfaces = r_refdef.scene.worldmodel ? r_refdef.scene.worldmodel->num_surfaces : 1;
        if (r_refdef.viewcache.maxentities < numentities)
@@ -2886,7 +2887,7 @@ void R_Main_ResizeViewCache(void)
                r_refdef.viewcache.world_numclusters = numclusters;
                if (r_refdef.viewcache.world_pvsbits)
                        Mem_Free(r_refdef.viewcache.world_pvsbits);
-               r_refdef.viewcache.world_pvsbits = Mem_Alloc(r_main_mempool, (r_refdef.viewcache.world_numclusters+7)>>3);
+               r_refdef.viewcache.world_pvsbits = Mem_Alloc(r_main_mempool, r_refdef.viewcache.world_numclusterbytes);
        }
        if (r_refdef.viewcache.world_numleafs != numleafs)
        {