zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

polymost.c: some meaning-preserving cleanups, make some vars file-local.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3384 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-01-08 23:12:51 +00:00
parent 0f72135a04
commit b870b6bfa3
3 changed files with 68 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/build/include/polymost.h
View file

@ -47,7 +47,6 @@ void polymost_drawrooms(void);
void polymost_glinit(void); void polymost_glinit(void);
void polymost_glreset(void); void polymost_glreset(void);
void polymost_cachesync(void);
void gltexinvalidate(int32_t dapicnum, int32_t dapalnum, int32_t dameth); void gltexinvalidate(int32_t dapicnum, int32_t dapalnum, int32_t dameth);
void gltexinvalidateall(void); void gltexinvalidateall(void);
@ -58,9 +57,6 @@ extern float curpolygonoffset;
extern int32_t cachefilehandle; extern int32_t cachefilehandle;
extern FILE *cacheindexptr; extern FILE *cacheindexptr;
extern hashtable_t h_texcache;
extern uint8_t *memcachedata;
extern int32_t memcachesize;
extern int32_t cachepos; extern int32_t cachepos;
struct cacheitem_t struct cacheitem_t
@ -75,8 +71,6 @@ typedef struct cacheitem_t texcacheindex;
#define TEXCACHEMAGIC "QLZ1" #define TEXCACHEMAGIC "QLZ1"
extern texcacheindex *cacheptrs[MAXTILES<<1];
int32_t dxtfilter(int32_t fil, const texcachepicture *pict, const char *pic, void *midbuf, char *packbuf, uint32_t miplen); int32_t dxtfilter(int32_t fil, const texcachepicture *pict, const char *pic, void *midbuf, char *packbuf, uint32_t miplen);
int32_t dedxtfilter(int32_t fil, const texcachepicture *pict, char *pic, void *midbuf, char *packbuf, int32_t ispacked); int32_t dedxtfilter(int32_t fil, const texcachepicture *pict, char *pic, void *midbuf, char *packbuf, int32_t ispacked);

1
polymer/eduke32/build/src/engine.c
View file

@ -9437,7 +9437,6 @@ static void finish_loadboard(const vec3_t *dapos, int16_t *dacursectnum, int16_t
#ifdef USE_OPENGL #ifdef USE_OPENGL
Bmemset(spritesmooth, 0, sizeof(spritesmooth_t)*(MAXSPRITES+MAXUNIQHUDID)); Bmemset(spritesmooth, 0, sizeof(spritesmooth_t)*(MAXSPRITES+MAXUNIQHUDID));
// polymost_cachesync();
# ifdef POLYMER # ifdef POLYMER
if (rendmode == 4) if (rendmode == 4)

161
polymer/eduke32/build/src/polymost.c
View file

@ -264,33 +264,16 @@ void drawline2d(float x0, float y0, float x1, float y1, char col)
// every virtual texture, I use a cache where indexing is managed through a hash table. // every virtual texture, I use a cache where indexing is managed through a hash table.
// //
// moved into polymost.h
/*typedef struct pthtyp_t
{
struct pthtyp_t *next;
GLuint glpic;
short picnum;
char palnum;
char effects;
char flags; // 1 = clamped (dameth&4), 2 = hightile, 4 = skybox face, 8 = hasalpha, 16 = hasfullbright, 128 = invalidated
char skyface;
hicreplctyp *hicr;
unsigned short sizx, sizy;
float scalex, scaley;
struct pthtyp_t *wofb; // without fullbright
struct pthtyp_t *ofb; // only fullbright
} pthtyp;*/
int32_t cachefilehandle = -1; // texture cache file handle int32_t cachefilehandle = -1; // texture cache file handle
FILE *cacheindexptr = NULL; FILE *cacheindexptr = NULL;
uint8_t *memcachedata = NULL; static uint8_t *memcachedata = NULL;
int32_t memcachesize = -1; static int32_t memcachesize = -1;
int32_t cachepos = 0; int32_t cachepos = 0;
// Set to 1 when we failed (re)allocating space for the memcache: // Set to 1 when we failed (re)allocating space for the memcache:
static int32_t dont_alloc_memcache = 0; static int32_t dont_alloc_memcache = 0;
hashtable_t h_texcache = { 1024, NULL }; static hashtable_t h_texcache = { 1024, NULL };
char TEXCACHEFILE[BMAX_PATH] = "textures"; char TEXCACHEFILE[BMAX_PATH] = "textures";
@ -299,7 +282,7 @@ float alphahackarray[MAXTILES];
static texcacheindex *firstcacheindex = NULL; static texcacheindex *firstcacheindex = NULL;
static texcacheindex *curcacheindex = NULL; static texcacheindex *curcacheindex = NULL;
texcacheindex *cacheptrs[MAXTILES<<1]; static texcacheindex *cacheptrs[MAXTILES<<1];
static int32_t numcacheentries = 0; static int32_t numcacheentries = 0;
@ -596,26 +579,30 @@ static void Cachefile_Free(void)
} }
} }
static void clear_memcache(void)
{
Bfree(memcachedata);
memcachedata = NULL;
memcachesize = -1;
}
void polymost_cachesync(void) static void polymost_cachesync(void)
{ {
if (memcachedata && cachefilehandle != -1 && filelength(cachefilehandle) > memcachesize) if (memcachedata && cachefilehandle != -1 && filelength(cachefilehandle) > memcachesize)
{ {
size_t len = filelength(cachefilehandle); size_t len = filelength(cachefilehandle);
uint8_t *tmpptr = (uint8_t *)Brealloc(memcachedata, len);
if (!tmpptr) memcachedata = (uint8_t *)Brealloc(memcachedata, len);
if (!memcachedata)
{ {
Bfree(memcachedata); clear_memcache();
memcachedata = NULL;
memcachesize = -1;
initprintf("Failed syncing memcache to texcache, disabling memcache.\n"); initprintf("Failed syncing memcache to texcache, disabling memcache.\n");
dont_alloc_memcache = 1; dont_alloc_memcache = 1;
} }
else else
{ {
initprintf("Syncing memcache to texcache\n"); initprintf("Syncing memcache to texcache\n");
memcachedata = tmpptr;
Blseek(cachefilehandle, memcachesize, BSEEK_SET); Blseek(cachefilehandle, memcachesize, BSEEK_SET);
Bread(cachefilehandle, memcachedata + memcachesize, len - memcachesize); Bread(cachefilehandle, memcachedata + memcachesize, len - memcachesize);
memcachesize = len; memcachesize = len;
@ -689,14 +676,7 @@ void polymost_glreset()
static void clear_cache_internal(void) static void clear_cache_internal(void)
{ {
Cachefile_CloseBoth(); Cachefile_CloseBoth();
clear_memcache();
if (memcachedata)
{
Bfree(memcachedata);
memcachedata = NULL;
memcachesize = -1;
}
Cachefile_Free(); Cachefile_Free();
curcacheindex = firstcacheindex = (texcacheindex *)Bcalloc(1, sizeof(texcacheindex)); curcacheindex = firstcacheindex = (texcacheindex *)Bcalloc(1, sizeof(texcacheindex));
@ -785,8 +765,8 @@ void polymost_glinit()
glusetexcache = 0; glusetexcache = 0;
return; return;
} }
else
initprintf("Opened \"%s\" as cache file\n", TEXCACHEFILE); initprintf("Opened \"%s\" as cache file\n", TEXCACHEFILE);
if (glusememcache && !dont_alloc_memcache) if (glusememcache && !dont_alloc_memcache)
{ {
@ -794,27 +774,20 @@ void polymost_glinit()
if (memcachesize > 0) if (memcachesize > 0)
{ {
uint8_t *tmpptr = (uint8_t *)Brealloc(memcachedata, memcachesize); memcachedata = (uint8_t *)Brealloc(memcachedata, memcachesize);
if (!tmpptr) if (!memcachedata)
{ {
initprintf("Failed allocating %d bytes for memcache, disabling memcache.\n", memcachesize); initprintf("Failed allocating %d bytes for memcache, disabling memcache.\n", memcachesize);
if (memcachedata) clear_memcache();
Bfree(memcachedata);
memcachedata = NULL;
memcachesize = -1;
dont_alloc_memcache = 1; dont_alloc_memcache = 1;
} }
else else
{ {
memcachedata = tmpptr;
if (Bread(cachefilehandle, memcachedata, memcachesize) != memcachesize) if (Bread(cachefilehandle, memcachedata, memcachesize) != memcachesize)
{ {
initprintf("Failed reading texcache into memcache!\n"); initprintf("Failed reading texcache into memcache!\n");
Bfree(memcachedata); clear_memcache();
memcachedata = NULL;
memcachesize = -1;
} }
} }
} }
@ -1086,7 +1059,7 @@ static void fixtransparency(int32_t dapicnum, coltype *dapic, int32_t daxsiz, in
const coltype *onedown = &dapic[(y+1)*daxsiz2+x]; const coltype *onedown = &dapic[(y+1)*daxsiz2+x];
if (wpptr->a==0 && onedown->a!=0) if (wpptr->a==0 && onedown->a!=0)
Bmemcpy(wpptr, onedown, sizeof(coltype)); Bmemcpy(wpptr, onedown, sizeof(coltype));
// Comment out to see what texels are affected: // Remove the comment to see what texels are affected:
//wpptr->r=255; wpptr->g = wpptr->b = 0; wpptr->a = 255; //wpptr->r=255; wpptr->g = wpptr->b = 0; wpptr->a = 255;
continue; continue;
} }
@ -1483,13 +1456,12 @@ int32_t polymost_trytexcache(const char *fn, int32_t len, int32_t dameth, char e
else else
{ {
Blseek(cachefilehandle, cachepos, BSEEK_SET); Blseek(cachefilehandle, cachepos, BSEEK_SET);
cachepos += sizeof(texcacheheader);
if (Bread(cachefilehandle, head, sizeof(texcacheheader)) < (int32_t)sizeof(texcacheheader)) if (Bread(cachefilehandle, head, sizeof(texcacheheader)) < (int32_t)sizeof(texcacheheader))
{ {
cachepos += sizeof(texcacheheader);
err = 0; err = 0;
goto failure; goto failure;
} }
cachepos += sizeof(texcacheheader);
} }
// checks... // checks...
@ -1539,13 +1511,11 @@ failure:
void writexcache(const char *fn, int32_t len, int32_t dameth, char effect, texcacheheader *head) void writexcache(const char *fn, int32_t len, int32_t dameth, char effect, texcacheheader *head)
{ {
int32_t fp; char cachefn[BMAX_PATH];
char cachefn[BMAX_PATH], *cp;
uint8_t mdsum[16]; uint8_t mdsum[16];
texcachepicture pict;
char *pic = NULL, *packbuf = NULL; char *pic = NULL, *packbuf = NULL;
void *midbuf = NULL; void *midbuf = NULL;
uint32_t alloclen=0, level, miplen; uint32_t alloclen=0, level;
uint32_t padx=0, pady=0; uint32_t padx=0, pady=0;
GLint gi; GLint gi;
int32_t offset = 0; int32_t offset = 0;
@ -1565,7 +1535,7 @@ void writexcache(const char *fn, int32_t len, int32_t dameth, char effect, texca
} }
gi = GL_FALSE; gi = GL_FALSE;
bglGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED_ARB, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED_ARB, &gi);
if (gi != GL_TRUE) if (gi != GL_TRUE)
{ {
OSD_Printf("Error: glGetTexLevelParameteriv returned GL_FALSE!\n"); OSD_Printf("Error: glGetTexLevelParameteriv returned GL_FALSE!\n");
@ -1574,9 +1544,12 @@ void writexcache(const char *fn, int32_t len, int32_t dameth, char effect, texca
md4once((const uint8_t *)fn, strlen(fn), mdsum); md4once((const uint8_t *)fn, strlen(fn), mdsum);
cp = cachefn; {
for (fp = 0; fp < 16; phex(mdsum[fp++], cp), cp+=2); int32_t fp;
Bsprintf(cp, "-%x-%x%x", len, dameth, effect); char *cp = cachefn;
for (fp = 0; fp < 16; phex(mdsum[fp++], cp), cp+=2);
Bsprintf(cp, "-%x-%x%x", len, dameth, effect);
}
Blseek(cachefilehandle, 0, BSEEK_END); Blseek(cachefilehandle, 0, BSEEK_END);
@ -1601,42 +1574,45 @@ void writexcache(const char *fn, int32_t len, int32_t dameth, char effect, texca
for (level = 0; level==0 || (padx > 1 || pady > 1); level++) for (level = 0; level==0 || (padx > 1 || pady > 1); level++)
{ {
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_COMPRESSED_ARB, (GLint *)&gi); uint32_t miplen;
texcachepicture pict;
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_COMPRESSED_ARB, &gi);
if (bglGetError() != GL_NO_ERROR) goto failure; if (bglGetError() != GL_NO_ERROR) goto failure;
if (gi != GL_TRUE) goto failure; // an uncompressed mipmap if (gi != GL_TRUE) goto failure; // an uncompressed mipmap
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_INTERNAL_FORMAT, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_INTERNAL_FORMAT, &gi);
if (bglGetError() != GL_NO_ERROR) goto failure; if (bglGetError() != GL_NO_ERROR) goto failure;
#ifdef __APPLE__ #ifdef __APPLE__
if (pr_ati_textureformat_one && gi == 1) gi = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT; if (pr_ati_textureformat_one && gi == 1) gi = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
#endif #endif
pict.format = B_LITTLE32(gi); pict.format = B_LITTLE32(gi);
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_WIDTH, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_WIDTH, &gi);
if (bglGetError() != GL_NO_ERROR) goto failure; if (bglGetError() != GL_NO_ERROR) goto failure;
padx = gi; pict.xdim = B_LITTLE32(gi); padx = gi; pict.xdim = B_LITTLE32(gi);
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_HEIGHT, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_HEIGHT, &gi);
if (bglGetError() != GL_NO_ERROR) goto failure; if (bglGetError() != GL_NO_ERROR) goto failure;
pady = gi; pict.ydim = B_LITTLE32(gi); pady = gi; pict.ydim = B_LITTLE32(gi);
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_BORDER, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_BORDER, &gi);
if (bglGetError() != GL_NO_ERROR) goto failure; if (bglGetError() != GL_NO_ERROR) goto failure;
pict.border = B_LITTLE32(gi); pict.border = B_LITTLE32(gi);
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_DEPTH, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_DEPTH, &gi);
if (bglGetError() != GL_NO_ERROR) goto failure; if (bglGetError() != GL_NO_ERROR) goto failure;
pict.depth = B_LITTLE32(gi); pict.depth = B_LITTLE32(gi);
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB, &gi);
if (bglGetError() != GL_NO_ERROR) goto failure; if (bglGetError() != GL_NO_ERROR) goto failure;
miplen = (int32_t)gi; pict.size = B_LITTLE32(gi); miplen = gi; pict.size = B_LITTLE32(gi);
if (alloclen < miplen) if (alloclen < miplen)
{ {
char *picc = (char *)Brealloc(pic, miplen); pic = (char *)Brealloc(pic, miplen);
if (!picc) goto failure; else pic = picc; if (!pic) goto failure;
alloclen = miplen; alloclen = miplen;
packbuf = (char *)Brealloc(packbuf, alloclen+400);
if (!packbuf) goto failure;
picc = (char *)Brealloc(packbuf, alloclen+400); midbuf = Brealloc(midbuf, miplen);
if (!picc) goto failure; else packbuf = picc; if (!midbuf) goto failure;
picc = (char *)Brealloc(midbuf, miplen);
if (!picc) goto failure; else midbuf = picc;
} }
bglGetCompressedTexImageARB(GL_TEXTURE_2D, level, pic); bglGetCompressedTexImageARB(GL_TEXTURE_2D, level, pic);
@ -1691,9 +1667,9 @@ failure:
Bmemset(curcacheindex->name,0,sizeof(curcacheindex->name)); Bmemset(curcacheindex->name,0,sizeof(curcacheindex->name));
success: success:
if (midbuf) Bfree(midbuf); Bfree(midbuf);
if (pic) Bfree(pic); Bfree(pic);
if (packbuf) Bfree(packbuf); Bfree(packbuf);
} }
static int32_t gloadtile_cached(int32_t fil, const 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)
@ -1750,15 +1726,15 @@ static int32_t gloadtile_cached(int32_t fil, const texcacheheader *head, int32_t
if (alloclen < pict.size) if (alloclen < pict.size)
{ {
char *picc = (char *)Brealloc(pic, pict.size); pic = (char *)Brealloc(pic, pict.size);
if (!picc) goto failure; else pic = picc; if (!pic) goto failure;
alloclen = pict.size; alloclen = pict.size;
packbuf = (char *)Brealloc(packbuf, alloclen+16);
if (!packbuf) goto failure;
picc = (char *)Brealloc(packbuf, alloclen+16); midbuf = Brealloc(midbuf, pict.size);
if (!picc) goto failure; else packbuf = picc; if (!midbuf) goto failure;
picc = (char *)Brealloc(midbuf, pict.size);
if (!picc) goto failure; else midbuf = picc;
} }
if (dedxtfilter(fil, &pict, pic, midbuf, packbuf, (head->flags&4)==4)) if (dedxtfilter(fil, &pict, pic, midbuf, packbuf, (head->flags&4)==4))
@ -1774,7 +1750,6 @@ static int32_t gloadtile_cached(int32_t fil, const texcacheheader *head, int32_t
GLint format; GLint format;
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_INTERNAL_FORMAT, &format); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_INTERNAL_FORMAT, &format);
if ((glerr = bglGetError()) != GL_NO_ERROR) { err=4; goto failure; } if ((glerr = bglGetError()) != GL_NO_ERROR) { err=4; goto failure; }
// format = B_LITTLE32(format);
if (pict.format != format) if (pict.format != format)
{ {
OSD_Printf("gloadtile_cached: invalid texture cache file format %d %d\n", pict.format, format); OSD_Printf("gloadtile_cached: invalid texture cache file format %d %d\n", pict.format, format);
@ -1784,9 +1759,9 @@ static int32_t gloadtile_cached(int32_t fil, const texcacheheader *head, int32_t
} }
if (midbuf) Bfree(midbuf); Bfree(midbuf);
if (pic) Bfree(pic); Bfree(pic);
if (packbuf) Bfree(packbuf); Bfree(packbuf);
return 0; return 0;
failure: failure:
@ -1803,9 +1778,9 @@ failure:
initprintf("gloadtile_cached: %s (glerr=%x)\n", errmsgs[err], glerr); initprintf("gloadtile_cached: %s (glerr=%x)\n", errmsgs[err], glerr);
} }
if (midbuf) Bfree(midbuf); Bfree(midbuf);
if (pic) Bfree(pic); Bfree(pic);
if (packbuf) Bfree(packbuf); Bfree(packbuf);
return -1; return -1;
} }
// --------------------------------------------------- JONOF'S COMPRESSED TEXTURE CACHE STUFF // --------------------------------------------------- JONOF'S COMPRESSED TEXTURE CACHE STUFF
@ -2030,7 +2005,7 @@ static int32_t gloadtile_hi(int32_t dapic,int32_t dapalnum, int32_t facen, hicre
texture_setup(dameth); texture_setup(dameth);
if (pic) Bfree(pic); Bfree(pic); pic=NULL;
if (tsizx>>r_downsize <= tilesizx[dapic] || tsizy>>r_downsize <= tilesizy[dapic]) if (tsizx>>r_downsize <= tilesizx[dapic] || tsizy>>r_downsize <= tilesizy[dapic])
hicr->flags |= (16+1); hicr->flags |= (16+1);