zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

maint: make the following static in polymost.c: 

- texcacheindex *firstcacheindex, *curcacheindex
 - trytexcache(), gloadtile_cached()
- Factor out duplicated code into clear_cache_internal()

git-svn-id: https://svn.eduke32.com/eduke32@2240 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-10 23:43:18 +00:00
parent 3e103e435a
commit a86dfe661b
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
polymer/eduke32/build/include/polymost.h
View File

@ -73,8 +73,8 @@ typedef struct cacheitem_t texcacheindex;
#define TEXCACHEMAGIC "QLZ1" #define TEXCACHEMAGIC "QLZ1"
extern texcacheindex *firstcacheindex; //extern texcacheindex *firstcacheindex;
extern texcacheindex *curcacheindex; //extern texcacheindex *curcacheindex;
extern texcacheindex *cacheptrs[MAXTILES<<1]; extern texcacheindex *cacheptrs[MAXTILES<<1];
extern int32_t numcacheentries; extern int32_t numcacheentries;

66
polymer/eduke32/build/src/polymost.c
View File

@ -300,8 +300,8 @@ char TEXCACHEFILE[BMAX_PATH] = "textures";
int32_t mdtims, omdtims; int32_t mdtims, omdtims;
float alphahackarray[MAXTILES]; float alphahackarray[MAXTILES];
texcacheindex *firstcacheindex = NULL; static texcacheindex *firstcacheindex = NULL;
texcacheindex *curcacheindex = NULL; static texcacheindex *curcacheindex = NULL;
texcacheindex *cacheptrs[MAXTILES<<1]; texcacheindex *cacheptrs[MAXTILES<<1];
int32_t numcacheentries = 0; int32_t numcacheentries = 0;
@ -689,6 +689,28 @@ void polymost_glreset()
#endif #endif
} }
static void clear_cache_internal(void)
{
Cachefile_CloseBoth();
if (memcachedata)
{
Bfree(memcachedata);
memcachedata = NULL;
memcachesize = -1;
}
Cachefile_RemoveDups();
curcacheindex = firstcacheindex = (texcacheindex *)Bcalloc(1, sizeof(texcacheindex));
numcacheentries = 0;
// Bmemset(&firstcacheindex, 0, sizeof(texcacheindex));
// Bmemset(&cacheptrs[0], 0, sizeof(cacheptrs));
hash_init(&h_texcache);
}
// one-time initialization of OpenGL for polymost // one-time initialization of OpenGL for polymost
void polymost_glinit() void polymost_glinit()
{ {
@ -744,24 +766,8 @@ void polymost_glinit()
bglEnableClientState(GL_VERTEX_ARRAY); bglEnableClientState(GL_VERTEX_ARRAY);
bglEnableClientState(GL_TEXTURE_COORD_ARRAY); bglEnableClientState(GL_TEXTURE_COORD_ARRAY);
Cachefile_CloseBoth(); clear_cache_internal();
if (memcachedata)
{
Bfree(memcachedata);
memcachedata = NULL;
memcachesize = -1;
}
Cachefile_RemoveDups();
curcacheindex = firstcacheindex = (texcacheindex *)Bcalloc(1, sizeof(texcacheindex));
numcacheentries = 0;
// Bmemset(&firstcacheindex, 0, sizeof(texcacheindex));
// Bmemset(&cacheptrs[0], 0, sizeof(cacheptrs));
hash_init(&h_texcache);
LoadCacheOffsets(); LoadCacheOffsets();
Bstrcpy(ptempbuf,TEXCACHEFILE); Bstrcpy(ptempbuf,TEXCACHEFILE);
@ -849,24 +855,8 @@ void invalidatecache(void)
polymost_glreset(); polymost_glreset();
Cachefile_CloseBoth(); clear_cache_internal();
if (memcachedata)
{
Bfree(memcachedata);
memcachedata = NULL;
memcachesize = -1;
}
Cachefile_RemoveDups();
curcacheindex = firstcacheindex = (texcacheindex *)Bcalloc(1, sizeof(texcacheindex));
numcacheentries = 0;
// Bmemset(&firstcacheindex, 0, sizeof(texcacheindex));
// Bmemset(&cacheptrs[0], 0, sizeof(cacheptrs));
hash_init(&h_texcache);
// LoadCacheOffsets(); // LoadCacheOffsets();
Bstrcpy(ptempbuf,TEXCACHEFILE); Bstrcpy(ptempbuf,TEXCACHEFILE);
@ -1328,7 +1318,7 @@ void phex(char v, char *s)
s[1] = x<10 ? (x+'0') : (x-10+'a'); s[1] = x<10 ? (x+'0') : (x-10+'a');
} }
int32_t trytexcache(char *fn, int32_t len, int32_t dameth, char effect, texcacheheader *head) static int32_t trytexcache(char *fn, int32_t len, int32_t dameth, char effect, texcacheheader *head)
{ {
int32_t fp, err=0; int32_t fp, err=0;
char cachefn[BMAX_PATH], *cp; char cachefn[BMAX_PATH], *cp;
@ -1565,7 +1555,7 @@ success:
if (packbuf) Bfree(packbuf); if (packbuf) Bfree(packbuf);
} }
int32_t gloadtile_cached(int32_t fil, texcacheheader *head, int32_t *doalloc, pthtyp *pth,int32_t dapalnum) static int32_t gloadtile_cached(int32_t fil, const texcacheheader *head, int32_t *doalloc, pthtyp *pth,int32_t dapalnum)
{ {
int32_t level, r; int32_t level, r;
texcachepicture pict; texcachepicture pict;