// 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 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;
{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
};
+extern int gl_backend_rebindtextures;
+
static void GL_TextureMode_f (void)
{
int i;
}
}
}
+ gl_backend_rebindtextures = true;
}
static int R_CalcTexelDataSize (gltexture_t *glt)
/*
if (resizebuffer) Mem_Free(resizebuffer);resizebuffer = NULL;
if (colorconvertbuffer) Mem_Free(colorconvertbuffer);colorconvertbuffer = NULL;
- if (resamplerow1) Mem_Free(resamplerow1);resamplerow1 = NULL;
- if (resamplerow2) Mem_Free(resamplerow2);resamplerow2 = NULL;
if (texturebuffer) Mem_Free(texturebuffer);texturebuffer = NULL;
if (gltexnuminuse) Mem_Free(gltexnuminuse);gltexnuminuse = NULL;
*/
resizebuffersize = 0;
- resamplerowsize = 0;
texturebuffersize = 0;
resizebuffer = NULL;
colorconvertbuffer = NULL;
- resamplerow1 = NULL;
- resamplerow2 = NULL;
texturebuffer = NULL;
gltexnuminuse = NULL;
Mem_FreePool(&texturemempool);
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)
-{
- int j, xi, oldx = 0, f, fstep, endx, lerp;
- fstep = (int) (inwidth*65536.0f/outwidth);
- endx = (inwidth-1);
- if (bytesperpixel == 4)
- {
- for (j = 0,f = 0;j < outwidth;j++, f += fstep)
- {
- xi = f >> 16;
- if (xi != oldx)
- {
- in += (xi - oldx) * 4;
- oldx = xi;
- }
- 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]);
- }
- else // last pixel of the line has no pixel to lerp to
- {
- *out++ = in[0];
- *out++ = in[1];
- *out++ = in[2];
- *out++ = in[3];
- }
- }
- }
- else if (bytesperpixel == 3)
- {
- for (j = 0,f = 0;j < outwidth;j++, f += fstep)
- {
- xi = f >> 16;
- if (xi != oldx)
- {
- in += (xi - oldx) * 3;
- oldx = xi;
- }
- 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]);
- }
- else // last pixel of the line has no pixel to lerp to
- {
- *out++ = in[0];
- *out++ = in[1];
- *out++ = in[2];
- }
- }
- }
- else
- Sys_Error("R_ResampleTextureLerpLine: unsupported bytesperpixel %i\n", bytesperpixel);
-}
-
-/*
-================
-R_ResampleTexture
-================
-*/
-static void R_ResampleTexture (void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight, int bytesperpixel)
-{
- if (resamplerowsize < outwidth*4)
- {
- if (resamplerow1)
- Mem_Free(resamplerow1);
- if (resamplerow2)
- Mem_Free(resamplerow2);
- resamplerowsize = outwidth*4;
- resamplerow1 = Mem_Alloc(textureprocessingmempool, resamplerowsize);
- resamplerow2 = Mem_Alloc(textureprocessingmempool, resamplerowsize);
- }
-#define row1 resamplerow1
-#define row2 resamplerow2
- if (bytesperpixel == 4)
- {
- if (r_lerpimages.integer)
- {
- int i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4;
- byte *inrow, *out;
- out = outdata;
- fstep = (int) (inheight*65536.0f/outheight);
-
- inrow = indata;
- oldy = 0;
- R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
- R_ResampleTextureLerpLine (inrow + inwidth4, row2, inwidth, outwidth, bytesperpixel);
- for (i = 0, f = 0;i < outheight;i++,f += fstep)
- {
- yi = f >> 16;
- if (yi < endy)
- {
- lerp = f & 0xFFFF;
- if (yi != oldy)
- {
- inrow = (byte *)indata + inwidth4*yi;
- if (yi == oldy+1)
- memcpy(row1, row2, outwidth4);
- else
- R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
- R_ResampleTextureLerpLine (inrow + inwidth4, row2, inwidth, outwidth, bytesperpixel);
- oldy = yi;
- }
- j = outwidth - 4;
- while(j >= 0)
- {
-#define LERPBYTE(i) out[i] = (byte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- LERPBYTE( 3);
- LERPBYTE( 4);
- LERPBYTE( 5);
- LERPBYTE( 6);
- LERPBYTE( 7);
- LERPBYTE( 8);
- LERPBYTE( 9);
- LERPBYTE(10);
- LERPBYTE(11);
- LERPBYTE(12);
- LERPBYTE(13);
- LERPBYTE(14);
- LERPBYTE(15);
- out += 16;
- row1 += 16;
- row2 += 16;
- j -= 4;
- }
- if (j & 2)
- {
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- LERPBYTE( 3);
- LERPBYTE( 4);
- LERPBYTE( 5);
- LERPBYTE( 6);
- LERPBYTE( 7);
- out += 8;
- row1 += 8;
- row2 += 8;
- }
- if (j & 1)
- {
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- LERPBYTE( 3);
- out += 4;
- row1 += 4;
- row2 += 4;
- }
- row1 -= outwidth4;
- row2 -= outwidth4;
- }
- else
- {
- if (yi != oldy)
- {
- inrow = (byte *)indata + inwidth4*yi;
- if (yi == oldy+1)
- memcpy(row1, row2, outwidth4);
- else
- R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
- oldy = yi;
- }
- memcpy(out, row1, outwidth4);
- }
- }
- }
- else
- {
- int i, j;
- unsigned frac, fracstep;
- // relies on int being 4 bytes
- int *inrow, *out;
- out = outdata;
-
- fracstep = inwidth*0x10000/outwidth;
- for (i = 0;i < outheight;i++)
- {
- inrow = (int *)indata + inwidth*(i*inheight/outheight);
- frac = fracstep >> 1;
- j = outwidth - 4;
- while (j >= 0)
- {
- out[0] = inrow[frac >> 16];frac += fracstep;
- out[1] = inrow[frac >> 16];frac += fracstep;
- out[2] = inrow[frac >> 16];frac += fracstep;
- out[3] = inrow[frac >> 16];frac += fracstep;
- out += 4;
- j -= 4;
- }
- if (j & 2)
- {
- out[0] = inrow[frac >> 16];frac += fracstep;
- out[1] = inrow[frac >> 16];frac += fracstep;
- out += 2;
- }
- if (j & 1)
- {
- out[0] = inrow[frac >> 16];frac += fracstep;
- out += 1;
- }
- }
- }
- }
- else if (bytesperpixel == 3)
- {
- if (r_lerpimages.integer)
- {
- int i, j, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
- byte *inrow, *out;
- out = outdata;
- fstep = (int) (inheight*65536.0f/outheight);
-
- inrow = indata;
- oldy = 0;
- R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
- R_ResampleTextureLerpLine (inrow + inwidth3, row2, inwidth, outwidth, bytesperpixel);
- for (i = 0, f = 0;i < outheight;i++,f += fstep)
- {
- yi = f >> 16;
- if (yi < endy)
- {
- lerp = f & 0xFFFF;
- if (yi != oldy)
- {
- inrow = (byte *)indata + inwidth3*yi;
- if (yi == oldy+1)
- memcpy(row1, row2, outwidth3);
- else
- R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
- R_ResampleTextureLerpLine (inrow + inwidth3, row2, inwidth, outwidth, bytesperpixel);
- oldy = yi;
- }
- j = outwidth - 4;
- while(j >= 0)
- {
-#define LERPBYTE(i) out[i] = (byte) ((((row2[i] - row1[i]) * lerp) >> 16) + row1[i])
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- LERPBYTE( 3);
- LERPBYTE( 4);
- LERPBYTE( 5);
- LERPBYTE( 6);
- LERPBYTE( 7);
- LERPBYTE( 8);
- LERPBYTE( 9);
- LERPBYTE(10);
- LERPBYTE(11);
- out += 12;
- row1 += 12;
- row2 += 12;
- j -= 4;
- }
- if (j & 2)
- {
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- LERPBYTE( 3);
- LERPBYTE( 4);
- LERPBYTE( 5);
- out += 6;
- row1 += 6;
- row2 += 6;
- }
- if (j & 1)
- {
- LERPBYTE( 0);
- LERPBYTE( 1);
- LERPBYTE( 2);
- out += 3;
- row1 += 3;
- row2 += 3;
- }
- row1 -= outwidth3;
- row2 -= outwidth3;
- }
- else
- {
- if (yi != oldy)
- {
- inrow = (byte *)indata + inwidth3*yi;
- if (yi == oldy+1)
- memcpy(row1, row2, outwidth3);
- else
- R_ResampleTextureLerpLine (inrow, row1, inwidth, outwidth, bytesperpixel);
- oldy = yi;
- }
- memcpy(out, row1, outwidth3);
- }
- }
- }
- else
- {
- int i, j, f, inwidth3 = inwidth * 3;
- unsigned frac, fracstep;
- byte *inrow, *out;
- out = outdata;
-
- fracstep = inwidth*0x10000/outwidth;
- for (i = 0;i < outheight;i++)
- {
- inrow = (byte *)indata + inwidth3*(i*inheight/outheight);
- frac = fracstep >> 1;
- j = outwidth - 4;
- while (j >= 0)
- {
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- j -= 4;
- }
- if (j & 2)
- {
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- out += 2;
- }
- if (j & 1)
- {
- f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
- out += 1;
- }
- }
- }
- }
- else
- Sys_Error("R_ResampleTexture: unsupported bytesperpixel %i\n", bytesperpixel);
-#undef row1
-#undef row2
-}
-
-// 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)
-{
- int x, y, nextrow;
- nextrow = *width * bytesperpixel;
- if (*width > destwidth)
- {
- *width >>= 1;
- if (*height > destheight)
- {
- // reduce both
- *height >>= 1;
- if (bytesperpixel == 4)
- {
- for (y = 0;y < *height;y++)
- {
- 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 += 4;
- in += 8;
- }
- in += nextrow; // skip a line
- }
- }
- else if (bytesperpixel == 3)
- {
- for (y = 0;y < *height;y++)
- {
- 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 += 3;
- in += 6;
- }
- in += nextrow; // skip a line
- }
- }
- else
- Sys_Error("R_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
- }
- else
- {
- // reduce width
- if (bytesperpixel == 4)
- {
- for (y = 0;y < *height;y++)
- {
- 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 += 4;
- in += 8;
- }
- }
- }
- else if (bytesperpixel == 3)
- {
- for (y = 0;y < *height;y++)
- {
- 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 += 3;
- in += 6;
- }
- }
- }
- else
- Sys_Error("R_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
- }
- }
- else
- {
- if (*height > destheight)
- {
- // reduce height
- *height >>= 1;
- if (bytesperpixel == 4)
- {
- for (y = 0;y < *height;y++)
- {
- 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 += 4;
- in += 4;
- }
- in += nextrow; // skip a line
- }
- }
- else if (bytesperpixel == 3)
- {
- for (y = 0;y < *height;y++)
- {
- 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;
- in += 3;
- }
- in += nextrow; // skip a line
- }
- }
- else
- Sys_Error("R_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
- }
- else
- Sys_Error("R_MipReduce: desired size already achieved\n");
- }
-}
-
-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);
CHECKGLERROR
+ gl_backend_rebindtextures = true;
+
glt->flags &= ~GLTEXF_UPLOAD;
if (glt->flags & TEXF_FRAGMENT)
if (glt->width != width || glt->height != height)
{
- R_ResampleTexture(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel);
+ Image_Resample(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel, r_lerpimages.integer);
prevbuffer = resizebuffer;
}
// apply picmip/max_size limitations
while (width > glt->image->width || height > glt->image->height)
{
- R_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel);
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel);
prevbuffer = resizebuffer;
}
}
{
while (width > 1 || height > 1)
{
- R_MipReduce(prevbuffer, resizebuffer, &width, &height, 1, 1, glt->image->bytesperpixel);
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, 1, 1, glt->image->bytesperpixel);
prevbuffer = resizebuffer;
glTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
}
}
-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));
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;
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;
return width;
}
-void R_UpdateTexture(rtexture_t *rt, byte *data)
+void R_UpdateTexture(rtexture_t *rt, qbyte *data)
{
gltexture_t *glt;
if (rt == NULL)
projects / xonotic / darkplaces.git / blobdiff