#include "quakedef.h"
-cvar_t r_max_size = {0, "r_max_size", "2048"};
-cvar_t r_picmip = {0, "r_picmip", "0"};
+cvar_t r_max_size = {CVAR_SAVE, "r_max_size", "2048"};
+cvar_t r_max_scrapsize = {CVAR_SAVE, "r_max_scrapsize", "256"};
+cvar_t r_picmip = {CVAR_SAVE, "r_picmip", "0"};
cvar_t r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"};
cvar_t r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"};
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
#define GLTEXF_DESTROYED 0x00040000
// size of images which hold fragment textures, ignores picmip and max_size
-#define BLOCK_SIZE 256
+//#define BLOCK_SIZE 256
+static int block_size;
// really this number only governs gltexnuminuse
#define MAX_GLTEXTURES 65536
rtexturepool_t *R_AllocTexturePool(void)
{
gltexturepool_t *pool;
+ if (texturemempool == NULL)
+ return NULL;
pool = Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
if (pool == NULL)
return NULL;
Host_Error("R_FreeTexturePool: pool not linked\n");
while (pool->gltchain)
R_FreeTexture(pool->gltchain);
+ if (pool->imagechain)
+ Sys_Error("R_FreeTexturePool: not all images freed\n");
Mem_Free(pool);
}
if (r_max_size.integer > realmaxsize)
Cvar_SetValue("r_max_size", realmaxsize);
// calculate final size
- width2 = 1;while (width2 < glt->width) width2 <<= 1;
- height2 = 1;while (height2 < glt->height) height2 <<= 1;
- width2 >>= (int) r_picmip.integer;
- height2 >>= (int) r_picmip.integer;
- while (width2 > (int) r_max_size.integer) width2 >>= 1;
- while (height2 > (int) r_max_size.integer) height2 >>= 1;
+ for (width2 = 1;width2 < glt->width;width2 <<= 1);
+ for (height2 = 1;height2 < glt->height;height2 <<= 1);
+ for (width2 >>= r_picmip.integer;width2 > r_max_size.integer;width2 >>= 1);
+ for (height2 >>= r_picmip.integer;height2 > r_max_size.integer;height2 >>= 1);
if (width2 < 1) width2 = 1;
if (height2 < 1) height2 = 1;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &realmaxsize);
CHECKGLERROR
- texturemempool = Mem_AllocPool("Textures");
+ // 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 < r_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");
gltexnuminuse = Mem_Alloc(texturemempool, MAX_GLTEXTURES);
//memset(gltexnuminuse, 0, MAX_GLTEXTURES);
}
texturebuffer = NULL;
gltexnuminuse = NULL;
Mem_FreePool(&texturemempool);
+ Mem_FreePool(&texturedatamempool);
+ Mem_FreePool(&textureprocessingmempool);
}
static void r_textures_newmap(void)
{
Cmd_AddCommand ("gl_texturemode", &GL_TextureMode_f);
Cmd_AddCommand("r_texturestats", R_TextureStats_f);
+ Cvar_RegisterVariable (&r_max_scrapsize);
Cvar_RegisterVariable (&r_max_size);
Cvar_RegisterVariable (&r_picmip);
Cvar_RegisterVariable (&r_lerpimages);
if (resamplerow2)
Mem_Free(resamplerow2);
resamplerowsize = outwidth*4;
- resamplerow1 = Mem_Alloc(texturemempool, resamplerowsize);
- resamplerow2 = Mem_Alloc(texturemempool, resamplerowsize);
+ resamplerow1 = Mem_Alloc(textureprocessingmempool, resamplerowsize);
+ resamplerow2 = Mem_Alloc(textureprocessingmempool, resamplerowsize);
}
#define row1 resamplerow1
#define row2 resamplerow2
Mem_Free(resizebuffer);
if (colorconvertbuffer)
Mem_Free(colorconvertbuffer);
- resizebuffer = Mem_Alloc(texturemempool, resizebuffersize);
- colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize);
+ resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+ colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
if (!resizebuffer || !colorconvertbuffer)
Host_Error("R_Upload: out of memory\n");
}
if (glt->image->flags & GLTEXF_UPLOAD)
{
+ Con_DPrintf("uploaded new fragments image\n");
glt->image->flags &= ~GLTEXF_UPLOAD;
memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->bytesperpixel);
+ glTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+ CHECKGLERROR
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
CHECKGLERROR
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
CHECKGLERROR
- glTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
- CHECKGLERROR
}
if (prevbuffer == NULL)
glt->image->flags &= ~GLTEXF_UPLOAD;
// these are rounded up versions of the size to do better resampling
- width = 1;while(width < glt->width) width *= 2;
- height = 1;while(height < glt->height) height *= 2;
+ for (width = 1;width < glt->width;width <<= 1);
+ for (height = 1;height < glt->height;height <<= 1);
if (resizebuffersize < width * height * glt->image->bytesperpixel)
{
Mem_Free(resizebuffer);
if (colorconvertbuffer)
Mem_Free(colorconvertbuffer);
- resizebuffer = Mem_Alloc(texturemempool, resizebuffersize);
- colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize);
+ resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+ colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
if (!resizebuffer || !colorconvertbuffer)
Host_Error("R_Upload: out of memory\n");
}
continue;
// got a fragments texture, find a place in it if we can
- best = BLOCK_SIZE;
- for (best = BLOCK_SIZE, i = 0;i < BLOCK_SIZE - w;i += texinfo->align)
+ best = block_size;
+ for (best = block_size, i = 0;i < block_size - w;i += texinfo->align)
{
for (best2 = 0, j = 0;j < w;j++)
{
}
}
- if (best + h > BLOCK_SIZE)
+ if (best + h > block_size)
continue;
for (i = 0;i < w;i++)
Sys_Error("R_FindImageForTexture: ran out of memory\n");
//memset(image, 0, sizeof(*image));
image->type = GLIMAGETYPE_FRAGMENTS;
- image->width = BLOCK_SIZE;
- image->height = BLOCK_SIZE;
- image->blockallocation = Mem_Alloc(texturemempool, BLOCK_SIZE * sizeof(short));
- memset(image->blockallocation, 0, BLOCK_SIZE * sizeof(short));
+ image->width = block_size;
+ image->height = block_size;
+ image->blockallocation = Mem_Alloc(texturemempool, block_size * sizeof(short));
+ memset(image->blockallocation, 0, block_size * sizeof(short));
x = 0;
y = 0;
// calculate final size
if (r_max_size.integer > realmaxsize)
Cvar_SetValue("r_max_size", realmaxsize);
- image->width = 1;while (image->width < glt->width) image->width <<= 1;
- image->height = 1;while (image->height < glt->height) image->height <<= 1;
- image->width >>= r_picmip.integer;while (image->width > r_max_size.integer) image->width >>= 1;
- image->height >>= r_picmip.integer;while (image->height > r_max_size.integer) image->height >>= 1;
+ for (image->width = 1;image->width < glt->width;image->width <<= 1);
+ for (image->height = 1;image->height < glt->height;image->height <<= 1);
+ for (image->width >>= r_picmip.integer;image->width > r_max_size.integer;image->width >>= 1);
+ for (image->height >>= r_picmip.integer;image->height > r_max_size.integer;image->height >>= 1);
if (image->width < 1) image->width = 1;
if (image->height < 1) image->height = 1;
}
if (texturebuffer)
Mem_Free(texturebuffer);
texturebuffersize = glt->width * glt->height * glt->textype->inputbytesperpixel;
- texturebuffer = Mem_Alloc(texturemempool, texturebuffersize);
+ texturebuffer = Mem_Alloc(textureprocessingmempool, texturebuffersize);
}
glt->generate(texturebuffer, glt->width, glt->height, (void *)glt->proceduraldata, glt->proceduraldatasize);
if (data)
{
- glt->inputtexels = Mem_Alloc(texturemempool, glt->width * glt->height * texinfo->inputbytesperpixel);
+ glt->inputtexels = Mem_Alloc(texturedatamempool, glt->width * glt->height * texinfo->inputbytesperpixel);
if (glt->inputtexels == NULL)
Sys_Error("R_SetupTexture: out of memory\n");
memcpy(glt->inputtexels, data, glt->width * glt->height * texinfo->inputbytesperpixel);
if (flags & TEXF_FRAGMENT)
{
- if (width > BLOCK_SIZE || height > BLOCK_SIZE)
- Host_Error("R_LoadTexture: fragment too big, must be no more than %dx%d\n", BLOCK_SIZE, BLOCK_SIZE);
+ if (width > block_size || height > block_size)
+ Host_Error("R_LoadTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size);
if ((width * texinfo->internalbytesperpixel) & 3)
Host_Error("R_LoadTexture: incompatible width for fragment");
}
if (identifier && (glt = R_FindTexture(pool, identifier)))
{
if (crc == glt->crc && width == glt->width && height == glt->height && texinfo == glt->textype && ((flags ^ glt->flags) & TEXF_IMPORTANTBITS) == 0 && ((flags ^ glt->flags) & GLTEXF_IMPORTANTBITS) == 0)
+ {
+ Con_Printf("R_LoadTexture: exact match with existing texture %s\n", identifier);
return (rtexture_t *)glt; // exact match, use existing
+ }
Con_Printf("R_LoadTexture: cache mismatch on %s, replacing old texture\n", identifier);
R_FreeTexture(glt);
}
// Host_Error("R_ProceduralTexture: \"%s\" has no generate function\n", identifier);
if (flags & TEXF_FRAGMENT)
{
- if (width > BLOCK_SIZE || height > BLOCK_SIZE)
- Host_Error("R_ProceduralTexture: fragment too big, must be no more than %dx%d\n", BLOCK_SIZE, BLOCK_SIZE);
+ if (width > block_size || height > block_size)
+ Host_Error("R_ProceduralTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size);
if ((width * texinfo->internalbytesperpixel) & 3)
Host_Error("R_ProceduralTexture: incompatible width for fragment");
}
if (identifier && (glt = R_FindTexture(pool, identifier)))
{
if (width == glt->width && height == glt->height && texinfo == glt->textype && ((flags ^ glt->flags) & TEXF_IMPORTANTBITS) == 0 && ((flags ^ glt->flags) & GLTEXF_IMPORTANTBITS) == 0)
+ {
+ Con_Printf("R_LoadTexture: exact match with existing texture %s\n", identifier);
return (rtexture_t *)glt; // exact match, use existing
+ }
Con_DPrintf("R_LoadTexture: cache mismatch, replacing old texture\n");
R_FreeTexture(glt);
}
return ((gltexture_t *)rt)->height;
}
-void R_GetFragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
{
gltexture_t *glt;
float iwidth, iheight;
return;
}
if (!rt)
- Host_Error("R_GetFragmentLocation: no texture supplied\n");
+ Host_Error("R_FragmentLocation: no texture supplied\n");
glt = (gltexture_t *)rt;
if (glt->flags & TEXF_FRAGMENT)
{
if (data == NULL)
Host_Error("R_UpdateTexture: no data supplied\n");
glt = (gltexture_t *)rt;
+ /*
if (!(glt->flags & GLTEXF_PROCEDURAL))
{
if (glt->inputtexels == NULL)
{
- glt->inputtexels = Mem_Alloc(texturemempool, glt->width * glt->height * glt->textype->inputbytesperpixel);
+ glt->inputtexels = Mem_Alloc(texturedatamempool, glt->width * glt->height * glt->textype->inputbytesperpixel);
if (glt->inputtexels == NULL)
Host_Error("R_UpdateTexture: ran out of memory\n");
}
memcpy(glt->inputtexels, data, glt->width * glt->height * glt->textype->inputbytesperpixel);
}
R_Upload(glt, data);
+ */
+ // if it has not been uploaded yet, update the data that will be used when it is
+ if (glt->inputtexels)
+ memcpy(glt->inputtexels, data, glt->width * glt->height * glt->textype->inputbytesperpixel);
+ else
+ R_Upload(glt, data);
}
projects / xonotic / darkplaces.git / blobdiff