We have enough memory, skip Com_PageInMemory

This commit is contained in:
Denis Pauk 2018-04-29 10:23:08 +03:00
parent b0b0265e4b
commit 1ea3fdc1a2
3 changed files with 7 additions and 12 deletions

View file

@ -300,7 +300,6 @@ void R_FreeUnusedImages (void)
{ {
if (image->registration_sequence == registration_sequence) if (image->registration_sequence == registration_sequence)
{ {
Com_PageInMemory ((byte *)image->pixels[0], image->width*image->height);
continue; // used this sequence continue; // used this sequence
} }
if (!image->registration_sequence) if (!image->registration_sequence)

View file

@ -1150,11 +1150,11 @@ Mod_LoadSpriteModel (model_t *mod, void *buffer)
//============================================================================= //=============================================================================
/* /*
@@@@@@@@@@@@@@@@@@@@@ =====================
RE_BeginRegistration RE_BeginRegistration
Specifies the model that will be used as the world Specifies the model that will be used as the world
@@@@@@@@@@@@@@@@@@@@@ =====================
*/ */
void RE_BeginRegistration (char *model) void RE_BeginRegistration (char *model)
{ {
@ -1177,10 +1177,10 @@ void RE_BeginRegistration (char *model)
/* /*
@@@@@@@@@@@@@@@@@@@@@ =====================
RE_RegisterModel RE_RegisterModel
@@@@@@@@@@@@@@@@@@@@@ =====================
*/ */
struct model_s *RE_RegisterModel (char *name) struct model_s *RE_RegisterModel (char *name)
{ {
@ -1223,10 +1223,10 @@ struct model_s *RE_RegisterModel (char *name)
} }
/* /*
@@@@@@@@@@@@@@@@@@@@@ =====================
RE_EndRegistration RE_EndRegistration
@@@@@@@@@@@@@@@@@@@@@ =====================
*/ */
void RE_EndRegistration (void) void RE_EndRegistration (void)
{ {
@ -1242,10 +1242,6 @@ void RE_EndRegistration (void)
Hunk_Free (mod->extradata); Hunk_Free (mod->extradata);
memset (mod, 0, sizeof(*mod)); memset (mod, 0, sizeof(*mod));
} }
else
{ // make sure it is paged in
Com_PageInMemory (mod->extradata, mod->extradatasize);
}
} }
R_FreeUnusedImages (); R_FreeUnusedImages ();

View file

@ -1007,7 +1007,7 @@ done:
return com_token; return com_token;
} }
int paged_total; static int paged_total = 0;
void void
Com_PageInMemory(byte *buffer, int size) Com_PageInMemory(byte *buffer, int size)