#include "quakedef.h"
-cvar_t r_max_size = {0, "r_max_size", "2048"};
-cvar_t r_max_scrapsize = {0, "r_max_scrapsize", "1024"};
-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
// since there is only one set of GL texture numbers, we have to track them
// globally, everything else is per texture pool
-static byte *gltexnuminuse;
+static qbyte *gltexnuminuse;
typedef struct
{
// location in the image, and size
int x, y, width, height;
// copy of the original texture supplied to the upload function, for re-uploading or deferred uploads (non-precached)
- byte *inputtexels;
+ qbyte *inputtexels;
// to identify cache mismatchs (this might be removed someday)
int crc;
// flags supplied to the LoadTexture/ProceduralTexture functions
// (might be altered to remove TEXF_ALPHA), and GLTEXF_ private flags
int flags;
// procedural texture generation function, called once per frame if the texture is used
- int (*generate)(byte *buffer, int width, int height, void *parameterdata, int parameterdatasize);
+ int (*generate)(qbyte *buffer, int width, int height, void *parameterdata, int parameterdatasize);
// data provided to generate, persistent from call to call
- byte *proceduraldata;
+ qbyte *proceduraldata;
// size of data
int proceduraldatasize;
// used only to avoid updating the texture more than once per frame
static gltexturepool_t *gltexturepoolchain = NULL;
-static byte *resamplerow1 = NULL, *resamplerow2 = NULL;
+static qbyte *resamplerow1 = NULL, *resamplerow2 = NULL;
static int resamplerowsize = 0;
-static byte *resizebuffer = NULL, *colorconvertbuffer;
+static qbyte *resizebuffer = NULL, *colorconvertbuffer;
static int resizebuffersize = 0;
-static byte *texturebuffer;
+static qbyte *texturebuffer;
static int texturebuffersize = 0;
static int realmaxsize = 0;
gltextureimage_t *image, **gltimagepointer;
GLuint texnum;
+ if (glt == NULL)
+ Host_Error("R_FreeTexture: texture == NULL\n");
+
for (gltpointer = &glt->pool->gltchain;*gltpointer && *gltpointer != glt;gltpointer = &(*gltpointer)->chain);
if (*gltpointer == glt)
*gltpointer = glt->chain;
else
- Host_Error("R_FreeTexture: texture not linked in pool\n");
+ Host_Error("R_FreeTexture: texture \"%s\" not linked in pool\n", glt->identifier);
// note: if freeing a fragment texture, this will not make the claimed
// space available for new textures unless all other fragments in the
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);
}
// 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("Textures");
+ 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)
R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
}
-static void R_ResampleTextureLerpLine (byte *in, byte *out, int inwidth, int outwidth, int bytesperpixel)
+static void R_ResampleTextureLerpLine (qbyte *in, qbyte *out, int inwidth, int outwidth, int bytesperpixel)
{
int j, xi, oldx = 0, f, fstep, endx, lerp;
fstep = (int) (inwidth*65536.0f/outwidth);
if (xi < endx)
{
lerp = f & 0xFFFF;
- *out++ = (byte) ((((in[4] - in[0]) * lerp) >> 16) + in[0]);
- *out++ = (byte) ((((in[5] - in[1]) * lerp) >> 16) + in[1]);
- *out++ = (byte) ((((in[6] - in[2]) * lerp) >> 16) + in[2]);
- *out++ = (byte) ((((in[7] - in[3]) * lerp) >> 16) + in[3]);
+ *out++ = (qbyte) ((((in[4] - in[0]) * lerp) >> 16) + in[0]);
+ *out++ = (qbyte) ((((in[5] - in[1]) * lerp) >> 16) + in[1]);
+ *out++ = (qbyte) ((((in[6] - in[2]) * lerp) >> 16) + in[2]);
+ *out++ = (qbyte) ((((in[7] - in[3]) * lerp) >> 16) + in[3]);
}
else // last pixel of the line has no pixel to lerp to
{
if (xi < endx)
{
lerp = f & 0xFFFF;
- *out++ = (byte) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
- *out++ = (byte) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
- *out++ = (byte) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
+ *out++ = (qbyte) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
+ *out++ = (qbyte) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
+ *out++ = (qbyte) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
}
else // last pixel of the line has no pixel to lerp to
{
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
{
if (r_lerpimages.integer)
{
- int i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4;
- byte *inrow, *out;
+ int i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4;
+ qbyte *inrow, *out;
out = outdata;
fstep = (int) (inheight*65536.0f/outheight);
lerp = f & 0xFFFF;
if (yi != oldy)
{
- inrow = (byte *)indata + inwidth4*yi;
+ inrow = (qbyte *)indata + inwidth4*yi;
if (yi == oldy+1)
memcpy(row1, row2, outwidth4);
else
j = outwidth - 4;
while(j >= 0)
{
-#define LERPBYTE(i) out[i] = (byte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
+#define LERPBYTE(i) out[i] = (qbyte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
LERPBYTE( 0);
LERPBYTE( 1);
LERPBYTE( 2);
{
if (yi != oldy)
{
- inrow = (byte *)indata + inwidth4*yi;
+ inrow = (qbyte *)indata + inwidth4*yi;
if (yi == oldy+1)
memcpy(row1, row2, outwidth4);
else
{
if (r_lerpimages.integer)
{
- int i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
- byte *inrow, *out;
+ int i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
+ qbyte *inrow, *out;
out = outdata;
fstep = (int) (inheight*65536.0f/outheight);
lerp = f & 0xFFFF;
if (yi != oldy)
{
- inrow = (byte *)indata + inwidth3*yi;
+ inrow = (qbyte *)indata + inwidth3*yi;
if (yi == oldy+1)
memcpy(row1, row2, outwidth3);
else
j = outwidth - 4;
while(j >= 0)
{
-#define LERPBYTE(i) out[i] = (byte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
+#define LERPBYTE(i) out[i] = (qbyte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
LERPBYTE( 0);
LERPBYTE( 1);
LERPBYTE( 2);
{
if (yi != oldy)
{
- inrow = (byte *)indata + inwidth3*yi;
+ inrow = (qbyte *)indata + inwidth3*yi;
if (yi == oldy+1)
memcpy(row1, row2, outwidth3);
else
{
int i, j, f, inwidth3 = inwidth * 3;
unsigned frac, fracstep;
- byte *inrow, *out;
+ qbyte *inrow, *out;
out = outdata;
fracstep = inwidth*0x10000/outwidth;
for (i = 0;i < outheight;i++)
{
- inrow = (byte *)indata + inwidth3*(i*inheight/outheight);
+ inrow = (qbyte *)indata + inwidth3*(i*inheight/outheight);
frac = fracstep >> 1;
j = outwidth - 4;
while (j >= 0)
}
// in can be the same as out
-static void R_MipReduce(byte *in, byte *out, int *width, int *height, int destwidth, int destheight, int bytesperpixel)
+static void R_MipReduce(qbyte *in, qbyte *out, int *width, int *height, int destwidth, int destheight, int bytesperpixel)
{
int x, y, nextrow;
nextrow = *width * bytesperpixel;
{
for (x = 0;x < *width;x++)
{
- out[0] = (byte) ((in[0] + in[4] + in[nextrow ] + in[nextrow+4]) >> 2);
- out[1] = (byte) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
- out[2] = (byte) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
- out[3] = (byte) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
+ out[0] = (qbyte) ((in[0] + in[4] + in[nextrow ] + in[nextrow+4]) >> 2);
+ out[1] = (qbyte) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
+ out[2] = (qbyte) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
+ out[3] = (qbyte) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
out += 4;
in += 8;
}
{
for (x = 0;x < *width;x++)
{
- out[0] = (byte) ((in[0] + in[3] + in[nextrow ] + in[nextrow+3]) >> 2);
- out[1] = (byte) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
- out[2] = (byte) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
+ out[0] = (qbyte) ((in[0] + in[3] + in[nextrow ] + in[nextrow+3]) >> 2);
+ out[1] = (qbyte) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
+ out[2] = (qbyte) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
out += 3;
in += 6;
}
{
for (x = 0;x < *width;x++)
{
- out[0] = (byte) ((in[0] + in[4]) >> 1);
- out[1] = (byte) ((in[1] + in[5]) >> 1);
- out[2] = (byte) ((in[2] + in[6]) >> 1);
- out[3] = (byte) ((in[3] + in[7]) >> 1);
+ out[0] = (qbyte) ((in[0] + in[4]) >> 1);
+ out[1] = (qbyte) ((in[1] + in[5]) >> 1);
+ out[2] = (qbyte) ((in[2] + in[6]) >> 1);
+ out[3] = (qbyte) ((in[3] + in[7]) >> 1);
out += 4;
in += 8;
}
{
for (x = 0;x < *width;x++)
{
- out[0] = (byte) ((in[0] + in[3]) >> 1);
- out[1] = (byte) ((in[1] + in[4]) >> 1);
- out[2] = (byte) ((in[2] + in[5]) >> 1);
+ out[0] = (qbyte) ((in[0] + in[3]) >> 1);
+ out[1] = (qbyte) ((in[1] + in[4]) >> 1);
+ out[2] = (qbyte) ((in[2] + in[5]) >> 1);
out += 3;
in += 6;
}
{
for (x = 0;x < *width;x++)
{
- out[0] = (byte) ((in[0] + in[nextrow ]) >> 1);
- out[1] = (byte) ((in[1] + in[nextrow+1]) >> 1);
- out[2] = (byte) ((in[2] + in[nextrow+2]) >> 1);
- out[3] = (byte) ((in[3] + in[nextrow+3]) >> 1);
+ out[0] = (qbyte) ((in[0] + in[nextrow ]) >> 1);
+ out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1);
+ out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1);
+ out[3] = (qbyte) ((in[3] + in[nextrow+3]) >> 1);
out += 4;
in += 4;
}
{
for (x = 0;x < *width;x++)
{
- out[0] = (byte) ((in[0] + in[nextrow ]) >> 1);
- out[1] = (byte) ((in[1] + in[nextrow+1]) >> 1);
- out[2] = (byte) ((in[2] + in[nextrow+2]) >> 1);
+ out[0] = (qbyte) ((in[0] + in[nextrow ]) >> 1);
+ out[1] = (qbyte) ((in[1] + in[nextrow+1]) >> 1);
+ out[2] = (qbyte) ((in[2] + in[nextrow+2]) >> 1);
out += 3;
in += 3;
}
}
}
-static void R_Upload(gltexture_t *glt, byte *data)
+static void R_Upload(gltexture_t *glt, qbyte *data)
{
int mip, width, height, internalformat;
- byte *prevbuffer;
+ qbyte *prevbuffer;
prevbuffer = data;
glBindTexture(GL_TEXTURE_2D, glt->image->texnum);
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);
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 (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);
}
}
-static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, byte *data, int (*generate)(byte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
+static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, qbyte *data, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
{
gltexture_t *glt;
glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
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);
R_LoadTexture
================
*/
-rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, byte *data, int textype, int flags)
+rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags)
{
int i;
gltexture_t *glt;
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);
}
return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data, NULL, NULL, 0);
}
-rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(byte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
+rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize)
{
gltexture_t *glt;
gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
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");
+ }
+ Con_Printf("R_LoadTexture: cache mismatch, replacing old texture\n");
R_FreeTexture(glt);
}
return width;
}
-void R_UpdateTexture(rtexture_t *rt, byte *data)
+void R_UpdateTexture(rtexture_t *rt, qbyte *data)
{
gltexture_t *glt;
if (rt == NULL)
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);
}