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
// 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
}
}
- 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;
while (pool->gltchain)
R_FreeTexture((rtexture_t *)pool->gltchain);
if (pool->imagechain)
- Sys_Error("R_FreeTexturePool: not all images freed\n");
+ Con_Printf("R_FreeTexturePool: not all images freed\n");
Mem_Free(pool);
}
static int R_CalcTexelDataSize (gltexture_t *glt)
{
- int width2, height2, depth2, size;
+ int width2, height2, depth2, size, picmip;
if (glt->flags & TEXF_FRAGMENT)
size = glt->width * glt->height * glt->depth;
else
{
+ picmip = 0;
+ if (glt->flags & TEXF_PICMIP)
+ picmip = gl_picmip.integer;
if (gl_max_size.integer > realmaxsize)
Cvar_SetValue("gl_max_size", realmaxsize);
// calculate final size
for (width2 = 1;width2 < glt->width;width2 <<= 1);
for (height2 = 1;height2 < glt->height;height2 <<= 1);
for (depth2 = 1;depth2 < glt->depth;depth2 <<= 1);
- for (width2 >>= gl_picmip.integer;width2 > gl_max_size.integer;width2 >>= 1);
- for (height2 >>= gl_picmip.integer;height2 > gl_max_size.integer;height2 >>= 1);
- for (depth2 >>= gl_picmip.integer;depth2 > gl_max_size.integer;depth2 >>= 1);
+ for (width2 >>= picmip;width2 > gl_max_size.integer;width2 >>= 1);
+ for (height2 >>= picmip;height2 > gl_max_size.integer;height2 >>= 1);
+ for (depth2 >>= picmip;depth2 > gl_max_size.integer;depth2 >>= 1);
if (width2 < 1) width2 = 1;
if (height2 < 1) height2 = 1;
if (depth2 < 1) depth2 = 1;
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 : "<unnamed>");
- }
- Con_Printf("pool %10p\n", pool);
- }
- R_TextureStats_PrintTotal();
+ R_TextureStats_Print(true, true, true);
}
char engineversion[40];
// 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");
- texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)");
- textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers");
+ texturemempool = Mem_AllocPool("texture management", 0, NULL);
// Disable JPEG screenshots if the DLL isn't loaded
if (! JPEG_OpenLibrary ())
colorconvertbuffer = NULL;
texturebuffer = NULL;
Mem_FreePool(&texturemempool);
- Mem_FreePool(&texturedatamempool);
- Mem_FreePool(&textureprocessingmempool);
}
static void r_textures_newmap(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)
for (image = pool->imagechain;image;image = image->imagechain)
{
// only update already uploaded images
- if (!(image->flags & GLTEXF_UPLOAD))
+ if (!(image->flags & GLTEXF_UPLOAD) && (image->flags & TEXF_MIPMAP))
{
qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
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");
}
CHECKGLERROR
- if (gl_support_anisotropy)
+ if (gl_support_anisotropy && (flags & TEXF_MIPMAP))
{
int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
if (gl_texture_anisotropy.integer != aniso)
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)
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
static void R_FindImageForTexture(gltexture_t *glt)
{
- int i, j, best, best2, x, y, z, w, h, d;
+ int i, j, best, best2, x, y, z, w, h, d, picmip;
textypeinfo_t *texinfo;
gltexturepool_t *pool;
gltextureimage_t *image, **imagechainpointer;
continue;
if (image->texturetype != glt->texturetype)
continue;
- if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP))
+ if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR))
continue;
if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
continue;
image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
if (image == NULL)
- Sys_Error("R_FindImageForTexture: ran out of memory\n");
+ {
+ Con_Printf ("R_FindImageForTexture: ran out of memory\n");
+ return;
+ }
image->type = GLIMAGETYPE_FRAGMENTS;
// make sure the created image is big enough for the fragment
for (image->width = block_size;image->width < glt->width;image->width <<= 1);
image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
if (image == NULL)
- Sys_Error("R_FindImageForTexture: ran out of memory\n");
+ {
+ Con_Printf ("R_FindImageForTexture: ran out of memory\n");
+ return;
+ }
image->type = GLIMAGETYPE_TILE;
image->blockallocation = NULL;
+ picmip = 0;
+ if (glt->flags & TEXF_PICMIP)
+ picmip = gl_picmip.integer;
// calculate final size
if (gl_max_size.integer > realmaxsize)
Cvar_SetValue("gl_max_size", realmaxsize);
for (image->width = 1;image->width < glt->width;image->width <<= 1);
for (image->height = 1;image->height < glt->height;image->height <<= 1);
for (image->depth = 1;image->depth < glt->depth;image->depth <<= 1);
- for (image->width >>= gl_picmip.integer;image->width > gl_max_size.integer;image->width >>= 1);
- for (image->height >>= gl_picmip.integer;image->height > gl_max_size.integer;image->height >>= 1);
- for (image->depth >>= gl_picmip.integer;image->depth > gl_max_size.integer;image->depth >>= 1);
+ for (image->width >>= picmip;image->width > gl_max_size.integer;image->width >>= 1);
+ for (image->height >>= picmip;image->height > gl_max_size.integer;image->height >>= 1);
+ for (image->depth >>= picmip;image->depth > gl_max_size.integer;image->depth >>= 1);
if (image->width < 1) image->width = 1;
if (image->height < 1) image->height = 1;
if (image->depth < 1) image->depth = 1;
image->texturetype = glt->texturetype;
image->glinternalformat = texinfo->glinternalformat;
image->glformat = texinfo->glformat;
- image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) | GLTEXF_UPLOAD;
+ image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)) | GLTEXF_UPLOAD;
image->bytesperpixel = texinfo->internalbytesperpixel;
image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
// get a texture number to use
return NULL;
if (flags & TEXF_FRAGMENT && texturetype != GLTEXTURETYPE_2D)
- Sys_Error("R_LoadTexture: only 2D fragment textures implemented\n");
+ {
+ Con_Printf ("R_LoadTexture: only 2D fragment textures implemented\n");
+ return NULL;
+ }
if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap)
- Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n");
+ {
+ Con_Printf ("R_LoadTexture: cubemap texture not supported by driver\n");
+ return NULL;
+ }
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);
+ Con_Printf ("R_LoadTexture: 3d texture not supported by driver\n");
+ return NULL;
}
- */
texinfo = R_GetTexTypeInfo(textype, flags);
size = width * height * depth * sides * texinfo->inputbytesperpixel;
if (size < 1)
- Sys_Error("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides);
+ {
+ Con_Printf ("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides);
+ return NULL;
+ }
// clear the alpha flag if the texture has no transparent pixels
switch(textype)
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;
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);
+ Con_Printf ("R_LoadTexture: out of memory\n");
+ else
+ memcpy(glt->inputtexels, data, size);
}
else
glt->inputtexels = NULL;
projects / xonotic / darkplaces.git / blobdiff