X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=d79c17a503cd11d28427924847d992611efdacf1;hb=76f9a5393f80aa5fa7525e14cfc92198ecd224ad;hp=0c9147caa8a18ce46ef91e6c35fda56cd4526400;hpb=e13a8c596f2c51ca815773f89fee4f4f4f723f74;p=xonotic%2Fdarkplaces.git diff --git a/gl_textures.c b/gl_textures.c index 0c9147ca..d79c17a5 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -15,8 +15,6 @@ int gl_filter_mag = GL_LINEAR; static mempool_t *texturemempool; -static mempool_t *texturedatamempool; -static mempool_t *textureprocessingmempool; // note: this must not conflict with TEXF_ flags in r_textures.h // cleared when a texture is uploaded @@ -100,7 +98,7 @@ typedef struct gltexture_s // pointer into gltextureimage array gltextureimage_t *image; // name of the texture (this might be removed someday), no duplicates - char *identifier; + char identifier[32]; // location in the image, and size int x, y, z, width, height, depth; // copy of the original texture(s) supplied to the upload function, for @@ -247,29 +245,11 @@ void R_FreeTexture(rtexture_t *rt) } } - if (glt->identifier) - Mem_Free(glt->identifier); if (glt->inputtexels) Mem_Free(glt->inputtexels); Mem_Free(glt); } -/* -static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier) -{ - gltexture_t *glt; - - if (!identifier) - return NULL; - - for (glt = pool->gltchain;glt;glt = glt->chain) - if (glt->identifier && !strcmp (identifier, glt->identifier)) - return glt; - - return NULL; -} -*/ - rtexturepool_t *R_AllocTexturePool(void) { gltexturepool_t *pool; @@ -426,46 +406,56 @@ static int R_CalcTexelDataSize (gltexture_t *glt) return size; } -void R_TextureStats_PrintTotal(void) +void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean printtotal) { - int glsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0; + int glsize; + int isloaded; + int pooltotal = 0, pooltotalt = 0, pooltotalp = 0, poolloaded = 0, poolloadedt = 0, poolloadedp = 0; + int sumtotal = 0, sumtotalt = 0, sumtotalp = 0, sumloaded = 0, sumloadedt = 0, sumloadedp = 0; gltexture_t *glt; gltexturepool_t *pool; + if (printeach) + Con_Print("glsize input loaded mip alpha name\n"); for (pool = gltexturepoolchain;pool;pool = pool->next) { + pooltotal = 0; + pooltotalt = 0; + pooltotalp = 0; + poolloaded = 0; + poolloadedt = 0; + poolloadedp = 0; for (glt = pool->gltchain;glt;glt = glt->chain) { glsize = R_CalcTexelDataSize(glt); - total++; - totalt += glsize; - totalp += glt->inputdatasize; - if (!(glt->flags & GLTEXF_UPLOAD)) + isloaded = !(glt->flags & GLTEXF_UPLOAD); + pooltotal++; + pooltotalt += glsize; + pooltotalp += glt->inputdatasize; + if (isloaded) { - loaded++; - loadedt += glsize; - loadedp += glt->inputdatasize; + poolloaded++; + poolloadedt += glsize; + poolloadedp += glt->inputdatasize; } + if (printeach) + Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", isloaded ? '[' : ' ', (glsize + 1023) / 1024, isloaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', isloaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier); } + if (printpool) + Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0); + sumtotal += pooltotal; + sumtotalt += pooltotalt; + sumtotalp += pooltotalp; + sumloaded += poolloaded; + sumloadedt += poolloadedt; + sumloadedp += poolloadedp; } - Con_Printf("total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", total, totalt / 1048576.0, totalp / 1048576.0, loaded, loadedt / 1048576.0, loadedp / 1048576.0, total - loaded, (totalt - loadedt) / 1048576.0, (totalp - loadedp) / 1048576.0); + if (printtotal) + Con_Printf("textures total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", sumtotal, sumtotalt / 1048576.0, sumtotalp / 1048576.0, sumloaded, sumloadedt / 1048576.0, sumloadedp / 1048576.0, sumtotal - sumloaded, (sumtotalt - sumloadedt) / 1048576.0, (sumtotalp - sumloadedp) / 1048576.0); } static void R_TextureStats_f(void) { - int loaded; - gltexture_t *glt; - gltexturepool_t *pool; - Con_Print("glsize input loaded mip alpha name\n"); - for (pool = gltexturepoolchain;pool;pool = pool->next) - { - for (glt = pool->gltchain;glt;glt = glt->chain) - { - loaded = !(glt->flags & GLTEXF_UPLOAD); - Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : ""); - } - Con_Printf("pool %10p\n", pool); - } - R_TextureStats_PrintTotal(); + R_TextureStats_Print(true, true, true); } char engineversion[40]; @@ -482,9 +472,7 @@ static void r_textures_start(void) // use the largest scrap texture size we can (not sure if this is really a good idea) for (block_size = 1;block_size < realmaxsize && block_size < gl_max_scrapsize.integer;block_size <<= 1); - texturemempool = Mem_AllocPool("Texture Info", 0, NULL); - texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)", 0, NULL); - textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers", 0, NULL); + texturemempool = Mem_AllocPool("texture management", 0, NULL); // Disable JPEG screenshots if the DLL isn't loaded if (! JPEG_OpenLibrary ()) @@ -509,8 +497,6 @@ static void r_textures_shutdown(void) colorconvertbuffer = NULL; texturebuffer = NULL; Mem_FreePool(&texturemempool); - Mem_FreePool(&texturedatamempool); - Mem_FreePool(&textureprocessingmempool); } static void r_textures_newmap(void) @@ -558,7 +544,7 @@ void R_Textures_Frame (void) GLint oldbindtexnum; old_aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy); - + Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso); for (pool = gltexturepoolchain;pool;pool = pool->next) @@ -589,8 +575,8 @@ void R_MakeResizeBufferBigger(int size) Mem_Free(resizebuffer); if (colorconvertbuffer) Mem_Free(colorconvertbuffer); - resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize); - colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize); + resizebuffer = Mem_Alloc(texturemempool, resizebuffersize); + colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize); if (!resizebuffer || !colorconvertbuffer) Host_Error("R_Upload: out of memory\n"); } @@ -713,7 +699,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) if (prevbuffer == NULL) { R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel); - memset(resizebuffer, 255, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel); + memset(resizebuffer, 0, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel); prevbuffer = resizebuffer; } else if (glt->textype->textype == TEXTYPE_PALETTE) @@ -760,7 +746,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) width = glt->image->width; height = glt->image->height; depth = glt->image->depth; - memset(resizebuffer, 255, width * height * depth * glt->image->bytesperpixel); + memset(resizebuffer, 0, width * height * depth * glt->image->bytesperpixel); prevbuffer = resizebuffer; } else @@ -1038,15 +1024,6 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden if (texturetype == GLTEXTURETYPE_3D && !gl_texture3d) Sys_Error("R_LoadTexture: 3d texture not supported by driver\n"); - /* - glt = R_FindTexture (pool, identifier); - if (glt) - { - Con_Printf("R_LoadTexture: replacing existing texture %s\n", identifier); - R_FreeTexture((rtexture_t *)glt); - } - */ - texinfo = R_GetTexTypeInfo(textype, flags); size = width * height * depth * sides * texinfo->inputbytesperpixel; if (size < 1) @@ -1101,12 +1078,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden glt = Mem_Alloc(texturemempool, sizeof(gltexture_t)); if (identifier) - { - glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1); - strcpy (glt->identifier, identifier); - } - else - glt->identifier = NULL; + strlcpy (glt->identifier, identifier, sizeof(glt->identifier)); glt->pool = pool; glt->chain = pool->gltchain; pool->gltchain = glt; @@ -1121,7 +1093,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden if (data) { - glt->inputtexels = Mem_Alloc(texturedatamempool, size); + glt->inputtexels = Mem_Alloc(texturemempool, size); if (glt->inputtexels == NULL) Sys_Error("R_LoadTexture: out of memory\n"); memcpy(glt->inputtexels, data, size);