#include "quakedef.h"
+#include "image.h"
+#include "jpeg.h"
+#include "image_png.h"
-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"};
+cvar_t gl_max_size = {CVAR_SAVE, "gl_max_size", "2048", "maximum allowed texture size, can be used to reduce video memory usage, note: this is automatically reduced to match video card capabilities (such as 256 on 3Dfx cards before Voodoo4/5)"};
+cvar_t gl_picmip = {CVAR_SAVE, "gl_picmip", "0", "reduces resolution of textures by powers of 2, for example 1 will halve width/height, reducing texture memory usage by 75%"};
+cvar_t r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1", "bilinear filters images when scaling them up to power of 2 size (mode 1), looks better than glquake (mode 0)"};
+cvar_t r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1", "0 = never upload textures until used, 1 = upload most textures before use (exceptions: rarely used skin colormap layers), 2 = upload all textures before use (can increase texture memory usage significantly)"};
+cvar_t gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1", "anisotropic filtering quality (if supported by hardware), 1 sample (no anisotropy) and 8 sample (8 tap anisotropy) are recommended values"};
int gl_filter_min = GL_LINEAR_MIPMAP_LINEAR;
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
#define GLTEXF_UPLOAD 0x00010000
-// texture generated by code, also causes permanent GLTEXF_UPLOAD effect
-#define GLTEXF_PROCEDURAL 0x00020000
// bitmask for mismatch checking
-#define GLTEXF_IMPORTANTBITS (GLTEXF_PROCEDURAL)
+#define GLTEXF_IMPORTANTBITS (0)
// set when image is uploaded and freed
#define GLTEXF_DESTROYED 0x00040000
-// size of images which hold fragment textures, ignores picmip and max_size
-//#define BLOCK_SIZE 256
-static int block_size;
-
-// really this number only governs gltexnuminuse
-#define MAX_GLTEXTURES 65536
-
-// since there is only one set of GL texture numbers, we have to track them
-// globally, everything else is per texture pool
-static qbyte *gltexnuminuse;
-
-typedef struct
+typedef struct textypeinfo_s
{
int textype;
int inputbytesperpixel;
int internalbytesperpixel;
int glformat;
int glinternalformat;
- int align;
}
textypeinfo_t;
-static textypeinfo_t textype_qpalette = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 3, 1};
-static textypeinfo_t textype_rgb = {TEXTYPE_RGB , 3, 3, GL_RGB , 3, 3};
-static textypeinfo_t textype_rgba = {TEXTYPE_RGBA , 4, 4, GL_RGBA, 3, 1};
-static textypeinfo_t textype_qpalette_alpha = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 4, 1};
-static textypeinfo_t textype_rgba_alpha = {TEXTYPE_RGBA , 4, 4, GL_RGBA, 4, 1};
-
-// a tiling texture (most common type)
-#define GLIMAGETYPE_TILE 0
-// a fragments texture (contains one or more fragment textures)
-#define GLIMAGETYPE_FRAGMENTS 1
+static textypeinfo_t textype_palette = {TEXTYPE_PALETTE, 1, 4, GL_RGBA , 3};
+static textypeinfo_t textype_rgb = {TEXTYPE_RGB , 3, 3, GL_RGB , 3};
+static textypeinfo_t textype_rgba = {TEXTYPE_RGBA , 4, 4, GL_RGBA , 3};
+static textypeinfo_t textype_palette_alpha = {TEXTYPE_PALETTE, 1, 4, GL_RGBA , 4};
+static textypeinfo_t textype_rgba_alpha = {TEXTYPE_RGBA , 4, 4, GL_RGBA , 4};
+
+#define GLTEXTURETYPE_1D 0
+#define GLTEXTURETYPE_2D 1
+#define GLTEXTURETYPE_3D 2
+#define GLTEXTURETYPE_CUBEMAP 3
+
+static int gltexturetypeenums[4] = {GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB};
+static int gltexturetypebindingenums[4] = {GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB};
+static int gltexturetypedimensions[4] = {1, 2, 3, 2};
+static int cubemapside[6] =
+{
+ GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
+ GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
+ GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
+ GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
+ GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
+ GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB
+};
-// a gltextureimage can have one (or more if fragments) gltextures inside
-typedef struct gltextureimage_s
+typedef struct gltexture_s
{
- struct gltextureimage_s *imagechain;
- int texturecount;
- int type; // one of the GLIMAGETYPE_ values
+ // this field is exposed to the R_GetTexture macro, for speed reasons
+ // (must be identical in rtexture_t)
int texnum; // GL texture slot number
- int width, height;
- int bytesperpixel; // bytes per pixel
- int glformat; // GL_RGB or GL_RGBA
- int glinternalformat; // 3 or 4
- int flags;
- short *blockallocation; // fragment allocation
-}
-gltextureimage_t;
-typedef struct gltexture_s
-{
// pointer to texturepool (check this to see if the texture is allocated)
struct gltexturepool_s *pool;
// pointer to next texture in texturepool chain
struct gltexture_s *chain;
- // pointer into gltextureimage array
- gltextureimage_t *image;
// name of the texture (this might be removed someday), no duplicates
- char *identifier;
- // 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)
- qbyte *inputtexels;
- // to identify cache mismatchs (this might be removed someday)
- int crc;
- // flags supplied to the LoadTexture/ProceduralTexture functions
+ char identifier[32];
+ // original data size in *inputtexels
+ int inputwidth, inputheight, inputdepth;
+ // copy of the original texture(s) supplied to the upload function, for
+ // delayed uploads (non-precached)
+ unsigned char *inputtexels;
+ // original data size in *inputtexels
+ int inputdatasize;
+ // flags supplied to the LoadTexture function
// (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)(qbyte *buffer, int width, int height, void *parameterdata, int parameterdatasize);
- // data provided to generate, persistent from call to call
- qbyte *proceduraldata;
- // size of data
- int proceduraldatasize;
- // used only to avoid updating the texture more than once per frame
- int proceduralframecount;
// pointer to one of the textype_ structs
textypeinfo_t *textype;
+ // one of the GLTEXTURETYPE_ values
+ int texturetype;
+ // palette if the texture is TEXTYPE_PALETTE
+ const unsigned int *palette;
+ // power of 2 size, after gl_picmip and gl_max_size are applied
+ int tilewidth, tileheight, tiledepth;
+ // 1 or 6 depending on texturetype
+ int sides;
+ // bytes per pixel
+ int bytesperpixel;
+ // GL_RGB or GL_RGBA
+ int glformat;
+ // 3 or 4
+ int glinternalformat;
}
gltexture_t;
typedef struct gltexturepool_s
{
- int sentinel;
- struct gltextureimage_s *imagechain;
+ unsigned int sentinel;
struct gltexture_s *gltchain;
struct gltexturepool_s *next;
}
static gltexturepool_t *gltexturepoolchain = NULL;
-static qbyte *resizebuffer = NULL, *colorconvertbuffer;
+static unsigned char *resizebuffer = NULL, *colorconvertbuffer;
static int resizebuffersize = 0;
-static qbyte *texturebuffer;
+static unsigned char *texturebuffer;
static int texturebuffersize = 0;
-static int realmaxsize = 0;
-
static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags)
{
if (flags & TEXF_ALPHA)
{
switch(textype)
{
- case TEXTYPE_QPALETTE:
- return &textype_qpalette_alpha;
+ case TEXTYPE_PALETTE:
+ return &textype_palette_alpha;
case TEXTYPE_RGB:
- Host_Error("R_GetTexTypeInfo: RGB format has no alpha, TEXF_ALPHA not allowed\n");
+ Host_Error("R_GetTexTypeInfo: RGB format has no alpha, TEXF_ALPHA not allowed");
return NULL;
case TEXTYPE_RGBA:
return &textype_rgba_alpha;
default:
- Host_Error("R_GetTexTypeInfo: unknown texture format\n");
+ Host_Error("R_GetTexTypeInfo: unknown texture format");
return NULL;
}
}
{
switch(textype)
{
- case TEXTYPE_QPALETTE:
- return &textype_qpalette;
+ case TEXTYPE_PALETTE:
+ return &textype_palette;
case TEXTYPE_RGB:
return &textype_rgb;
case TEXTYPE_RGBA:
return &textype_rgba;
default:
- Host_Error("R_GetTexTypeInfo: unknown texture format\n");
+ Host_Error("R_GetTexTypeInfo: unknown texture format");
return NULL;
}
}
R_UploadTexture(glt);
}
-int R_GetTexture(rtexture_t *rt)
+int R_RealGetTexture(rtexture_t *rt)
{
- gltexture_t *glt;
- if (!rt)
- return 0;
- glt = (gltexture_t *)rt;
- if (glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL))
+ if (rt)
{
- if (glt->flags & GLTEXF_PROCEDURAL)
- {
- if (glt->proceduralframecount != r_framecount)
- {
- glt->proceduralframecount = r_framecount;
- R_UploadTexture(glt);
- }
- }
- else
+ gltexture_t *glt;
+ glt = (gltexture_t *)rt;
+ if (glt->flags & GLTEXF_UPLOAD)
R_UploadTexture(glt);
+ return glt->texnum;
}
- return glt->image->texnum;
+ else
+ return 0;
}
-static void R_FreeTexture(gltexture_t *glt)
+void R_FreeTexture(rtexture_t *rt)
{
- gltexture_t **gltpointer;
- gltextureimage_t *image, **gltimagepointer;
- GLuint texnum;
+ gltexture_t *glt, **gltpointer;
+ glt = (gltexture_t *)rt;
if (glt == NULL)
- Host_Error("R_FreeTexture: texture == NULL\n");
+ Host_Error("R_FreeTexture: texture == NULL");
for (gltpointer = &glt->pool->gltchain;*gltpointer && *gltpointer != glt;gltpointer = &(*gltpointer)->chain);
if (*gltpointer == glt)
*gltpointer = glt->chain;
else
- 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
- // image are also freed
- image = glt->image;
- image->texturecount--;
- if (image->texturecount < 1)
- {
- for (gltimagepointer = &glt->pool->imagechain;*gltimagepointer && *gltimagepointer != image;gltimagepointer = &(*gltimagepointer)->imagechain);
- if (*gltimagepointer == image)
- *gltimagepointer = image->imagechain;
- else
- Host_Error("R_FreeTexture: image not linked in pool\n");
- if (image->texnum)
- {
- texnum = image->texnum;
- gltexnuminuse[image->texnum] = 0;
- qglDeleteTextures(1, &texnum);
- }
- if (image->blockallocation)
- Mem_Free(image->blockallocation);
- Mem_Free(image);
- }
+ Host_Error("R_FreeTexture: texture \"%s\" not linked in pool", glt->identifier);
+
+ if (glt->texnum)
+ qglDeleteTextures(1, (GLuint *)&glt->texnum);
- if (glt->identifier)
- Mem_Free(glt->identifier);
if (glt->inputtexels)
Mem_Free(glt->inputtexels);
- if (glt->proceduraldata)
- Mem_Free(glt->proceduraldata);
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;
if (texturemempool == NULL)
return NULL;
- pool = Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
+ pool = (gltexturepool_t *)Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
if (pool == NULL)
return NULL;
pool->next = gltexturepoolchain;
pool = (gltexturepool_t *)(*rtexturepool);
*rtexturepool = NULL;
if (pool->sentinel != TEXTUREPOOL_SENTINEL)
- Host_Error("R_FreeTexturePool: pool already freed\n");
+ Host_Error("R_FreeTexturePool: pool already freed");
for (poolpointer = &gltexturepoolchain;*poolpointer && *poolpointer != pool;poolpointer = &(*poolpointer)->next);
if (*poolpointer == pool)
*poolpointer = pool->next;
else
- Host_Error("R_FreeTexturePool: pool not linked\n");
+ Host_Error("R_FreeTexturePool: pool not linked");
while (pool->gltchain)
- R_FreeTexture(pool->gltchain);
- if (pool->imagechain)
- Sys_Error("R_FreeTexturePool: not all images freed\n");
+ R_FreeTexture((rtexture_t *)pool->gltchain);
Mem_Free(pool);
}
-typedef struct
+typedef struct glmode_s
{
char *name;
int minification, magnification;
}
glmode_t;
-static glmode_t modes[] =
+static glmode_t modes[6] =
{
{"GL_NEAREST", GL_NEAREST, GL_NEAREST},
{"GL_LINEAR", GL_LINEAR, GL_LINEAR},
{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
};
-extern int gl_backend_rebindtextures;
-
static void GL_TextureMode_f (void)
{
int i;
- gltextureimage_t *image;
+ GLint oldbindtexnum;
+ gltexture_t *glt;
gltexturepool_t *pool;
if (Cmd_Argc() == 1)
{
if (gl_filter_min == modes[i].minification)
{
- Con_Printf ("%s\n", modes[i].name);
+ Con_Printf("%s\n", modes[i].name);
return;
}
}
- Con_Printf ("current filter is unknown???\n");
+ Con_Print("current filter is unknown???\n");
return;
}
for (i = 0;i < 6;i++)
- if (!Q_strcasecmp (modes[i].name, Cmd_Argv(1) ) )
+ if (!strcasecmp (modes[i].name, Cmd_Argv(1) ) )
break;
if (i == 6)
{
- Con_Printf ("bad filter name\n");
+ Con_Print("bad filter name\n");
return;
}
// FIXME: force renderer(/client/something?) restart instead?
for (pool = gltexturepoolchain;pool;pool = pool->next)
{
- for (image = pool->imagechain;image;image = image->imagechain)
+ for (glt = pool->gltchain;glt;glt = glt->chain)
{
// only update already uploaded images
- if (!(image->flags & GLTEXF_UPLOAD))
+ if (!(glt->flags & (GLTEXF_UPLOAD | TEXF_FORCENEAREST | TEXF_FORCELINEAR)))
{
- qglBindTexture(GL_TEXTURE_2D, image->texnum);
- if (image->flags & TEXF_MIPMAP)
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+ qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);
+ qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);
+ if (glt->flags & TEXF_MIPMAP)
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_min);
else
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+ qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);
}
}
}
- gl_backend_rebindtextures = true;
}
+static void GL_Texture_CalcImageSize(int texturetype, int flags, int inwidth, int inheight, int indepth, int *outwidth, int *outheight, int *outdepth)
+{
+ int picmip = 0, maxsize = 0, width2 = 1, height2 = 1, depth2 = 1;
+
+ if (gl_max_size.integer > gl_max_texture_size)
+ Cvar_SetValue("gl_max_size", gl_max_texture_size);
+
+ switch (texturetype)
+ {
+ default:
+ case GLTEXTURETYPE_1D:
+ case GLTEXTURETYPE_2D:
+ maxsize = gl_max_texture_size;
+ break;
+ case GLTEXTURETYPE_3D:
+ maxsize = gl_max_3d_texture_size;
+ break;
+ case GLTEXTURETYPE_CUBEMAP:
+ maxsize = gl_max_cube_map_texture_size;
+ break;
+ }
+
+ if (flags & TEXF_PICMIP)
+ {
+ maxsize = min(maxsize, gl_max_size.integer);
+ picmip = gl_picmip.integer;
+ }
+
+ if (outwidth)
+ {
+ for (width2 = 1;width2 < inwidth;width2 <<= 1);
+ for (width2 >>= picmip;width2 > maxsize;width2 >>= 1);
+ *outwidth = max(1, width2);
+ }
+ if (outheight)
+ {
+ for (height2 = 1;height2 < inheight;height2 <<= 1);
+ for (height2 >>= picmip;height2 > maxsize;height2 >>= 1);
+ *outheight = max(1, height2);
+ }
+ if (outdepth)
+ {
+ for (depth2 = 1;depth2 < indepth;depth2 <<= 1);
+ for (depth2 >>= picmip;depth2 > maxsize;depth2 >>= 1);
+ *outdepth = max(1, depth2);
+ }
+}
+
+
static int R_CalcTexelDataSize (gltexture_t *glt)
{
- int width2, height2, size;
- if (glt->flags & TEXF_FRAGMENT)
- size = glt->width * glt->height;
- else
+ int width2, height2, depth2, size;
+
+ GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &width2, &height2, &depth2);
+
+ size = width2 * height2 * depth2;
+
+ if (glt->flags & TEXF_MIPMAP)
{
- if (r_max_size.integer > realmaxsize)
- Cvar_SetValue("r_max_size", realmaxsize);
- // calculate final size
- 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;
-
- size = 0;
- if (glt->flags & TEXF_MIPMAP)
+ while (width2 > 1 || height2 > 1 || depth2 > 1)
{
- while (width2 > 1 || height2 > 1)
- {
- size += width2 * height2;
- if (width2 > 1)
- width2 >>= 1;
- if (height2 > 1)
- height2 >>= 1;
- }
- size++; // count the last 1x1 mipmap
+ if (width2 > 1)
+ width2 >>= 1;
+ if (height2 > 1)
+ height2 >>= 1;
+ if (depth2 > 1)
+ depth2 >>= 1;
+ size += width2 * height2 * depth2;
}
- else
- size = width2*height2;
}
- size *= glt->textype->internalbytesperpixel;
- return size;
+ return size * glt->textype->internalbytesperpixel * glt->sides;
}
-void R_TextureStats_PrintTotal(void)
+void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean printtotal)
{
- int glsize, inputsize, 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);
- inputsize = glt->width * glt->height * glt->textype->inputbytesperpixel;
-
- total++;
- totalt += glsize;
- totalp += inputsize;
- if (!(glt->flags & GLTEXF_UPLOAD))
+ isloaded = !(glt->flags & GLTEXF_UPLOAD);
+ pooltotal++;
+ pooltotalt += glsize;
+ pooltotalp += glt->inputdatasize;
+ if (isloaded)
{
- loaded++;
- loadedt += glsize;
- loadedp += inputsize;
+ 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_Printf("glsize input crc 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);
- if (glt->flags & GLTEXF_PROCEDURAL)
- Con_Printf("%c%4i%c %4i PROC %s %s %s %s\n" , loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : "<unnamed>");
- else
- Con_Printf("%c%4i%c%c%4i%c %04X %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, glt->inputtexels ? ']' : ' ', glt->crc, 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];
-
static void r_textures_start(void)
{
- // deal with size limits of various drivers (3dfx in particular)
- qglGetIntegerv(GL_MAX_TEXTURE_SIZE, &realmaxsize);
+ // LordHavoc: allow any alignment
+ qglPixelStorei(GL_UNPACK_ALIGNMENT, 1);
CHECKGLERROR
- // 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 management", 0, NULL);
- 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);
+ // Disable JPEG screenshots if the DLL isn't loaded
+ if (! JPEG_OpenLibrary ())
+ Cvar_SetValueQuick (&scr_screenshot_jpeg, 0);
+ // TODO: support png screenshots?
+ PNG_OpenLibrary ();
}
static void r_textures_shutdown(void)
{
rtexturepool_t *temp;
+
+ JPEG_CloseLibrary ();
+
while(gltexturepoolchain)
{
temp = (rtexturepool_t *) gltexturepoolchain;
resizebuffer = NULL;
colorconvertbuffer = NULL;
texturebuffer = NULL;
- gltexnuminuse = NULL;
Mem_FreePool(&texturemempool);
- Mem_FreePool(&texturedatamempool);
- Mem_FreePool(&textureprocessingmempool);
}
static void r_textures_newmap(void)
void R_Textures_Init (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);
+ Cmd_AddCommand("gl_texturemode", &GL_TextureMode_f, "set texture filtering mode (GL_NEAREST, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, etc)");
+ Cmd_AddCommand("r_texturestats", R_TextureStats_f, "print information about all loaded textures and some statistics");
+ Cvar_RegisterVariable (&gl_max_size);
+ Cvar_RegisterVariable (&gl_picmip);
Cvar_RegisterVariable (&r_lerpimages);
Cvar_RegisterVariable (&r_precachetextures);
- gltexnuminuse = NULL;
+ Cvar_RegisterVariable (&gl_texture_anisotropy);
R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
}
-static void R_Upload(gltexture_t *glt, qbyte *data)
+void R_Textures_Frame (void)
{
- int mip, width, height, internalformat;
- qbyte *prevbuffer;
- prevbuffer = data;
+ static int old_aniso = 0;
- qglBindTexture(GL_TEXTURE_2D, glt->image->texnum);
- CHECKGLERROR
-
- gl_backend_rebindtextures = true;
+ // could do procedural texture animation here, if we keep track of which
+ // textures were accessed this frame...
- glt->flags &= ~GLTEXF_UPLOAD;
+ // free the resize buffers
+ resizebuffersize = 0;
+ if (resizebuffer)
+ {
+ Mem_Free(resizebuffer);
+ resizebuffer = NULL;
+ }
+ if (colorconvertbuffer)
+ {
+ Mem_Free(colorconvertbuffer);
+ colorconvertbuffer = NULL;
+ }
- if (glt->flags & TEXF_FRAGMENT)
+ if (old_aniso != gl_texture_anisotropy.integer)
{
- if (resizebuffersize < glt->image->width * glt->image->height * glt->image->bytesperpixel)
- {
- resizebuffersize = glt->image->width * glt->image->height * glt->image->bytesperpixel;
- if (resizebuffer)
- Mem_Free(resizebuffer);
- if (colorconvertbuffer)
- Mem_Free(colorconvertbuffer);
- resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
- colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
- if (!resizebuffer || !colorconvertbuffer)
- Host_Error("R_Upload: out of memory\n");
- }
+ gltexture_t *glt;
+ gltexturepool_t *pool;
+ GLint oldbindtexnum;
- 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);
- qglTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
- CHECKGLERROR
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
- CHECKGLERROR
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
- CHECKGLERROR
- }
+ old_aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
- if (prevbuffer == NULL)
- {
- memset(resizebuffer, 255, glt->width * glt->height * glt->image->bytesperpixel);
- prevbuffer = resizebuffer;
- }
- else if (glt->textype->textype == TEXTYPE_QPALETTE)
- {
- // promote paletted to RGBA, so we only have to worry about RGB and
- // RGBA in the rest of this code
- Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table);
- prevbuffer = colorconvertbuffer;
- }
+ Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso);
- qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
- return;
- }
+ for (pool = gltexturepoolchain;pool;pool = pool->next)
+ {
+ for (glt = pool->gltchain;glt;glt = glt->chain)
+ {
+ // only update already uploaded images
+ if ((glt->flags & (GLTEXF_UPLOAD | TEXF_MIPMAP)) == TEXF_MIPMAP)
+ {
+ qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);
- glt->image->flags &= ~GLTEXF_UPLOAD;
+ qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);
+ qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR
- // these are rounded up versions of the size to do better resampling
- for (width = 1;width < glt->width;width <<= 1);
- for (height = 1;height < glt->height;height <<= 1);
+ qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);
+ }
+ }
+ }
+ }
+}
- if (resizebuffersize < width * height * glt->image->bytesperpixel)
+void R_MakeResizeBufferBigger(int size)
+{
+ if (resizebuffersize < size)
{
- resizebuffersize = width * height * glt->image->bytesperpixel;
+ resizebuffersize = size;
if (resizebuffer)
Mem_Free(resizebuffer);
if (colorconvertbuffer)
Mem_Free(colorconvertbuffer);
- resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
- colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+ resizebuffer = (unsigned char *)Mem_Alloc(texturemempool, resizebuffersize);
+ colorconvertbuffer = (unsigned char *)Mem_Alloc(texturemempool, resizebuffersize);
if (!resizebuffer || !colorconvertbuffer)
- Host_Error("R_Upload: out of memory\n");
+ Host_Error("R_Upload: out of memory");
}
+}
- if (prevbuffer == NULL)
+static void GL_SetupTextureParameters(int flags, int texturetype)
+{
+ int textureenum = gltexturetypeenums[texturetype];
+ int wrapmode = ((flags & TEXF_CLAMP) && gl_support_clamptoedge) ? GL_CLAMP_TO_EDGE : GL_REPEAT;
+
+ CHECKGLERROR
+
+ if (gl_support_anisotropy && (flags & TEXF_MIPMAP))
{
- width = glt->image->width;
- height = glt->image->height;
- memset(resizebuffer, 255, width * height * glt->image->bytesperpixel);
- prevbuffer = resizebuffer;
+ int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
+ if (gl_texture_anisotropy.integer != aniso)
+ Cvar_SetValueQuick(&gl_texture_anisotropy, aniso);
+ qglTexParameteri(textureenum, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso);CHECKGLERROR
}
- else
+ qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);CHECKGLERROR
+ qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);CHECKGLERROR
+ if (gltexturetypedimensions[texturetype] >= 3)
{
- if (glt->textype->textype == TEXTYPE_QPALETTE)
- {
- // promote paletted to RGBA, so we only have to worry about RGB and
- // RGBA in the rest of this code
- Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table);
- prevbuffer = colorconvertbuffer;
- }
+ qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);CHECKGLERROR
+ }
- if (glt->width != width || glt->height != height)
+ CHECKGLERROR
+ if (flags & TEXF_FORCENEAREST)
+ {
+ if (flags & TEXF_MIPMAP)
{
- Image_Resample(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel, r_lerpimages.integer);
- prevbuffer = resizebuffer;
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);CHECKGLERROR
}
-
- // apply picmip/max_size limitations
- while (width > glt->image->width || height > glt->image->height)
+ else
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel);
- prevbuffer = resizebuffer;
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);CHECKGLERROR
}
+ qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);CHECKGLERROR
}
-
- // 3 and 4 are converted by the driver to it's preferred format for the current display mode
- internalformat = 3;
- if (glt->flags & TEXF_ALPHA)
- internalformat = 4;
-
- mip = 0;
- qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
- if (glt->flags & TEXF_MIPMAP)
+ else if (flags & TEXF_FORCELINEAR)
{
- while (width > 1 || height > 1)
+ if (flags & TEXF_MIPMAP)
{
- Image_MipReduce(prevbuffer, resizebuffer, &width, &height, 1, 1, glt->image->bytesperpixel);
- prevbuffer = resizebuffer;
-
- qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
- CHECKGLERROR
+ if (gl_filter_min == GL_NEAREST_MIPMAP_LINEAR || gl_filter_min == GL_LINEAR_MIPMAP_LINEAR)
+ {
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);CHECKGLERROR
+ }
+ else
+ {
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);CHECKGLERROR
+ }
}
-
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
- CHECKGLERROR
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
- CHECKGLERROR
+ else
+ {
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);CHECKGLERROR
+ }
+ qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);CHECKGLERROR
}
else
{
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
- CHECKGLERROR
- qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
- CHECKGLERROR
+ if (flags & TEXF_MIPMAP)
+ {
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR
+ }
+ else
+ {
+ qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);CHECKGLERROR
+ }
+ qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
}
+
+ CHECKGLERROR
}
-static void R_FindImageForTexture(gltexture_t *glt)
+static void R_Upload(gltexture_t *glt, unsigned char *data, int fragx, int fragy, int fragz, int fragwidth, int fragheight, int fragdepth)
{
- int i, j, best, best2, x, y, w, h;
- textypeinfo_t *texinfo;
- gltexturepool_t *pool;
- gltextureimage_t *image, **imagechainpointer;
- texinfo = glt->textype;
- pool = glt->pool;
-
- x = 0;
- y = 0;
- w = glt->width;
- h = glt->height;
- if (glt->flags & TEXF_FRAGMENT)
- {
- for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain)
- {
- image = *imagechainpointer;
- if (image->type != GLIMAGETYPE_FRAGMENTS)
- continue;
- if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
- 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)
- {
- for (best2 = 0, j = 0;j < w;j++)
- {
- if (image->blockallocation[i+j] >= best)
- break;
- if (best2 < image->blockallocation[i+j])
- best2 = image->blockallocation[i+j];
- }
- if (j == w)
- {
- // this is a valid spot
- x = i;
- y = best = best2;
- }
- }
+ int i, mip, width, height, depth;
+ GLint oldbindtexnum;
+ unsigned char *prevbuffer;
+ prevbuffer = data;
- if (best + h > block_size)
- continue;
+ CHECKGLERROR
- for (i = 0;i < w;i++)
- image->blockallocation[x + i] = best + h;
+ // we need to restore the texture binding after finishing the upload
+ qglGetIntegerv(gltexturetypebindingenums[glt->texturetype], &oldbindtexnum);
+ qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);
+ CHECKGLERROR
- glt->x = x;
- glt->y = y;
- glt->image = image;
- image->texturecount++;
- return;
- }
+ R_MakeResizeBufferBigger(fragwidth * fragheight * fragdepth * glt->sides * glt->bytesperpixel);
- image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
- if (image == NULL)
- Sys_Error("R_FindImageForTexture: ran out of memory\n");
- 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));
-
- x = 0;
- y = 0;
- for (i = 0;i < w;i++)
- image->blockallocation[x + i] = y + h;
+ if (prevbuffer == NULL)
+ {
+ memset(resizebuffer, 0, fragwidth * fragheight * fragdepth * glt->bytesperpixel);
+ prevbuffer = resizebuffer;
}
- else
+ else if (glt->textype->textype == TEXTYPE_PALETTE)
{
- for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain);
-
- image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
- if (image == NULL)
- Sys_Error("R_FindImageForTexture: ran out of memory\n");
- image->type = GLIMAGETYPE_TILE;
- image->blockallocation = NULL;
-
- // calculate final size
- if (r_max_size.integer > realmaxsize)
- Cvar_SetValue("r_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->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;
+ // promote paletted to RGBA, so we only have to worry about RGB and
+ // RGBA in the rest of this code
+ Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, fragwidth * fragheight * fragdepth * glt->sides, glt->palette);
+ prevbuffer = colorconvertbuffer;
}
- image->glinternalformat = texinfo->glinternalformat;
- image->glformat = texinfo->glformat;
- image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA)) | GLTEXF_UPLOAD;
- image->bytesperpixel = texinfo->internalbytesperpixel;
- for (i = 1;i < MAX_GLTEXTURES;i++)
- if (!gltexnuminuse[i])
- break;
- if (i < MAX_GLTEXTURES)
- gltexnuminuse[image->texnum = i] = true;
- else
- Sys_Error("R_FindImageForTexture: ran out of GL textures\n");
- *imagechainpointer = image;
- image->texturecount++;
- glt->x = x;
- glt->y = y;
- glt->image = image;
-}
+ // these are rounded up versions of the size to do better resampling
+ for (width = 1;width < glt->inputwidth ;width <<= 1);
+ for (height = 1;height < glt->inputheight;height <<= 1);
+ for (depth = 1;depth < glt->inputdepth ;depth <<= 1);
-// note: R_FindImageForTexture must be called before this
-static void R_UploadTexture (gltexture_t *glt)
-{
- if (!(glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL)))
- return;
+ R_MakeResizeBufferBigger(width * height * depth * glt->sides * glt->bytesperpixel);
- if (glt->flags & GLTEXF_PROCEDURAL)
+ if ((glt->flags & (TEXF_MIPMAP | TEXF_PICMIP | GLTEXF_UPLOAD)) == 0)
{
- if (glt->generate)
+ // update a portion of the image
+ switch(glt->texturetype)
{
- if (texturebuffersize < glt->width * glt->height * glt->textype->inputbytesperpixel)
- {
- if (texturebuffer)
- Mem_Free(texturebuffer);
- texturebuffersize = glt->width * glt->height * glt->textype->inputbytesperpixel;
- texturebuffer = Mem_Alloc(textureprocessingmempool, texturebuffersize);
- }
-
- glt->generate(texturebuffer, glt->width, glt->height, (void *)glt->proceduraldata, glt->proceduraldatasize);
+ case GLTEXTURETYPE_1D:
+ qglTexSubImage1D(GL_TEXTURE_1D, 0, fragx, fragwidth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ break;
+ case GLTEXTURETYPE_2D:
+ qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ break;
+ case GLTEXTURETYPE_3D:
+ qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ break;
+ default:
+ Host_Error("R_Upload: partial update of type other than 1D, 2D, or 3D");
+ break;
}
}
else
{
- R_Upload(glt, glt->inputtexels);
- if (glt->inputtexels)
+ if (fragx || fragy || fragz || glt->inputwidth != fragwidth || glt->inputheight != fragheight || glt->inputdepth != fragdepth)
+ Host_Error("R_Upload: partial update not allowed on initial upload or in combination with PICMIP or MIPMAP\n");
+
+ // upload the image for the first time
+ glt->flags &= ~GLTEXF_UPLOAD;
+
+ // cubemaps contain multiple images and thus get processed a bit differently
+ if (glt->texturetype != GLTEXTURETYPE_CUBEMAP)
{
- Mem_Free(glt->inputtexels);
- glt->inputtexels = NULL;
- glt->flags |= GLTEXF_DESTROYED;
+ if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
+ {
+ Image_Resample(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, glt->bytesperpixel, r_lerpimages.integer);
+ prevbuffer = resizebuffer;
+ }
+ // picmip/max_size
+ while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
+ {
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth, glt->bytesperpixel);
+ prevbuffer = resizebuffer;
+ }
}
- else if (glt->flags & GLTEXF_DESTROYED)
- Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier);
+ mip = 0;
+ switch(glt->texturetype)
+ {
+ case GLTEXTURETYPE_1D:
+ qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ if (glt->flags & TEXF_MIPMAP)
+ {
+ while (width > 1 || height > 1 || depth > 1)
+ {
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->bytesperpixel);
+ prevbuffer = resizebuffer;
+ qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ }
+ }
+ break;
+ case GLTEXTURETYPE_2D:
+ qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ if (glt->flags & TEXF_MIPMAP)
+ {
+ while (width > 1 || height > 1 || depth > 1)
+ {
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->bytesperpixel);
+ prevbuffer = resizebuffer;
+ qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ }
+ }
+ break;
+ case GLTEXTURETYPE_3D:
+ qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ if (glt->flags & TEXF_MIPMAP)
+ {
+ while (width > 1 || height > 1 || depth > 1)
+ {
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->bytesperpixel);
+ prevbuffer = resizebuffer;
+ qglTexImage3D(GL_TEXTURE_3D, mip++, glt->glinternalformat, width, height, depth, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ }
+ }
+ break;
+ case GLTEXTURETYPE_CUBEMAP:
+ // convert and upload each side in turn,
+ // from a continuous block of input texels
+ texturebuffer = prevbuffer;
+ for (i = 0;i < 6;i++)
+ {
+ prevbuffer = texturebuffer;
+ texturebuffer += glt->inputwidth * glt->inputheight * glt->inputdepth * glt->textype->inputbytesperpixel;
+ if (glt->inputwidth != width || glt->inputheight != height || glt->inputdepth != depth)
+ {
+ Image_Resample(prevbuffer, glt->inputwidth, glt->inputheight, glt->inputdepth, resizebuffer, width, height, depth, glt->bytesperpixel, r_lerpimages.integer);
+ prevbuffer = resizebuffer;
+ }
+ // picmip/max_size
+ while (width > glt->tilewidth || height > glt->tileheight || depth > glt->tiledepth)
+ {
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->tilewidth, glt->tileheight, glt->tiledepth, glt->bytesperpixel);
+ prevbuffer = resizebuffer;
+ }
+ mip = 0;
+ qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ if (glt->flags & TEXF_MIPMAP)
+ {
+ while (width > 1 || height > 1 || depth > 1)
+ {
+ Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->bytesperpixel);
+ prevbuffer = resizebuffer;
+ qglTexImage2D(cubemapside[i], mip++, glt->glinternalformat, width, height, 0, glt->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+ CHECKGLERROR
+ }
+ }
+ }
+ break;
+ }
+ GL_SetupTextureParameters(glt->flags, glt->texturetype);
}
+ qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);
}
-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)
+static void R_UploadTexture (gltexture_t *glt)
{
- gltexture_t *glt;
- 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;
- glt->pool = pool;
- glt->chain = pool->gltchain;
- pool->gltchain = glt;
- glt->crc = crc;
- glt->width = width;
- glt->height = height;
- glt->flags = flags;
- glt->textype = texinfo;
+ if (!(glt->flags & GLTEXF_UPLOAD))
+ return;
- if (data)
+ qglGenTextures(1, (GLuint *)&glt->texnum);
+ R_Upload(glt, glt->inputtexels, 0, 0, 0, glt->inputwidth, glt->inputheight, glt->inputdepth);
+ if (glt->inputtexels)
{
- 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);
- }
- else
+ Mem_Free(glt->inputtexels);
glt->inputtexels = NULL;
-
- glt->generate = generate;
- glt->proceduraldatasize = proceduraldatasize;
- if (proceduraldatasize)
- {
- glt->proceduraldata = Mem_Alloc(texturemempool, proceduraldatasize);
- if (glt->proceduraldata == NULL)
- Sys_Error("R_SetupTexture: out of memory\n");
+ glt->flags |= GLTEXF_DESTROYED;
}
- else
- glt->proceduraldata = NULL;
-
- R_FindImageForTexture(glt);
- R_PrecacheTexture(glt);
-
- return glt;
+ else if (glt->flags & GLTEXF_DESTROYED)
+ Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier);
}
-/*
-================
-R_LoadTexture
-================
-*/
-rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags)
+static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, int sides, int flags, int textype, int texturetype, const unsigned char *data, const unsigned int *palette)
{
- int i;
+ int i, size;
gltexture_t *glt;
gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
textypeinfo_t *texinfo;
- unsigned short crc;
if (cls.state == ca_dedicated)
return NULL;
- texinfo = R_GetTexTypeInfo(textype, flags);
+ if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap)
+ {
+ Con_Printf ("R_LoadTexture: cubemap texture not supported by driver\n");
+ return NULL;
+ }
+ if (texturetype == GLTEXTURETYPE_3D && !gl_texture3d)
+ {
+ Con_Printf ("R_LoadTexture: 3d texture not supported by driver\n");
+ return NULL;
+ }
- if (flags & TEXF_FRAGMENT)
+ texinfo = R_GetTexTypeInfo(textype, flags);
+ size = width * height * depth * sides * texinfo->inputbytesperpixel;
+ if (size < 1)
{
- 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");
+ 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)
{
- case TEXTYPE_QPALETTE:
+ case TEXTYPE_PALETTE:
if (flags & TEXF_ALPHA)
{
flags &= ~TEXF_ALPHA;
- for (i = 0;i < width * height;i++)
+ if (data)
{
- if (data[i] == 255)
+ for (i = 0;i < size;i++)
{
- flags |= TEXF_ALPHA;
- break;
+ if (((unsigned char *)&palette[data[i]])[3] < 255)
+ {
+ flags |= TEXF_ALPHA;
+ break;
+ }
}
}
}
break;
case TEXTYPE_RGB:
if (flags & TEXF_ALPHA)
- Host_Error("R_LoadTexture: RGB has no alpha, don't specify TEXF_ALPHA\n");
+ Host_Error("R_LoadTexture: RGB has no alpha, don't specify TEXF_ALPHA");
break;
case TEXTYPE_RGBA:
if (flags & TEXF_ALPHA)
{
flags &= ~TEXF_ALPHA;
- for (i = 0;i < width * height;i++)
+ if (data)
{
- if (data[i * 4 + 3] < 255)
+ for (i = 3;i < size;i += 4)
{
- flags |= TEXF_ALPHA;
- break;
+ if (data[i] < 255)
+ {
+ flags |= TEXF_ALPHA;
+ break;
+ }
}
}
}
break;
default:
- Host_Error("R_LoadTexture: unknown texture type\n");
+ Host_Error("R_LoadTexture: unknown texture type");
}
- // LordHavoc: do a CRC to confirm the data really is the same as previous occurances.
- if (data == NULL)
- crc = 0;
- else
- crc = CRC_Block(data, width*height*texinfo->inputbytesperpixel);
+ glt = (gltexture_t *)Mem_Alloc(texturemempool, sizeof(gltexture_t));
+ if (identifier)
+ strlcpy (glt->identifier, identifier, sizeof(glt->identifier));
+ glt->pool = pool;
+ glt->chain = pool->gltchain;
+ pool->gltchain = glt;
+ glt->inputwidth = width;
+ glt->inputheight = height;
+ glt->inputdepth = depth;
+ glt->flags = flags | GLTEXF_UPLOAD;
+ glt->textype = texinfo;
+ glt->texturetype = texturetype;
+ glt->inputdatasize = size;
+ glt->palette = palette;
+ glt->glinternalformat = texinfo->glinternalformat;
+ glt->glformat = texinfo->glformat;
+ glt->bytesperpixel = texinfo->internalbytesperpixel;
+ glt->sides = glt->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
+ glt->texnum = -1;
- // see if the texture is already present
- if (identifier && (glt = R_FindTexture(pool, identifier)))
+ if (data)
{
- 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);
+ glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, size);
+ memcpy(glt->inputtexels, data, size);
}
+ else
+ glt->inputtexels = NULL;
- return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data, NULL, NULL, 0);
+ GL_Texture_CalcImageSize(glt->texturetype, glt->flags, glt->inputwidth, glt->inputheight, glt->inputdepth, &glt->tilewidth, &glt->tileheight, &glt->tiledepth);
+ R_PrecacheTexture(glt);
+
+ return (rtexture_t *)glt;
}
-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)
+rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette)
{
- gltexture_t *glt;
- gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
- textypeinfo_t *texinfo;
-
- if (cls.state == ca_dedicated)
- return NULL;
-
- texinfo = R_GetTexTypeInfo(textype, flags);
-
- 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 * texinfo->internalbytesperpixel) & 3)
- Host_Error("R_ProceduralTexture: incompatible width for fragment");
- }
-
- // see if the texture is already present
- 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_Printf("R_LoadTexture: cache mismatch, replacing old texture\n");
- R_FreeTexture(glt);
- }
+ return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data, palette);
+}
- return (rtexture_t *)R_SetupTexture(pool, identifier, 0, width, height, flags | GLTEXF_PROCEDURAL | GLTEXF_UPLOAD, texinfo, NULL, generate, proceduraldata, proceduraldatasize);
+rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, int textype, int flags, const unsigned int *palette)
+{
+ return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data, palette);
}
-int R_TextureHasAlpha(rtexture_t *rt)
+rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const unsigned char *data, int textype, int flags, const unsigned int *palette)
{
- gltexture_t *glt;
- if (!rt)
- return false;
- glt = (gltexture_t *)rt;
- return (glt->flags & TEXF_ALPHA) != 0;
+ return R_SetupTexture(rtexturepool, identifier, width, height, depth, 1, flags, textype, GLTEXTURETYPE_3D, data, palette);
}
-int R_TextureWidth(rtexture_t *rt)
+rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette)
{
- if (!rt)
- return false;
- return ((gltexture_t *)rt)->width;
+ return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, palette);
}
-int R_TextureHeight(rtexture_t *rt)
+int R_TextureHasAlpha(rtexture_t *rt)
{
- if (!rt)
- return false;
- return ((gltexture_t *)rt)->height;
+ return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false;
}
-void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+int R_TextureWidth(rtexture_t *rt)
{
- gltexture_t *glt;
- float iwidth, iheight;
- if (cls.state == ca_dedicated)
- {
- if (x)
- *x = 0;
- if (y)
- *y = 0;
- if (fx1 || fy1 || fx2 || fy2)
- {
- if (fx1)
- *fx1 = 0;
- if (fy1)
- *fy1 = 0;
- if (fx2)
- *fx2 = 1;
- if (fy2)
- *fy2 = 1;
- }
- return;
- }
- if (!rt)
- Host_Error("R_FragmentLocation: no texture supplied\n");
- glt = (gltexture_t *)rt;
- if (glt->flags & TEXF_FRAGMENT)
- {
- if (x)
- *x = glt->x;
- if (y)
- *y = glt->y;
- if (fx1 || fy1 || fx2 || fy2)
- {
- iwidth = 1.0f / glt->image->width;
- iheight = 1.0f / glt->image->height;
- if (fx1)
- *fx1 = glt->x * iwidth;
- if (fy1)
- *fy1 = glt->y * iheight;
- if (fx2)
- *fx2 = (glt->x + glt->width) * iwidth;
- if (fy2)
- *fy2 = (glt->y + glt->height) * iheight;
- }
- }
- else
- {
- if (x)
- *x = 0;
- if (y)
- *y = 0;
- if (fx1 || fy1 || fx2 || fy2)
- {
- if (fx1)
- *fx1 = 0;
- if (fy1)
- *fy1 = 0;
- if (fx2)
- *fx2 = 1;
- if (fy2)
- *fy2 = 1;
- }
- }
+ return rt ? ((gltexture_t *)rt)->inputwidth : 0;
}
-int R_CompatibleFragmentWidth(int width, int textype, int flags)
+int R_TextureHeight(rtexture_t *rt)
{
- textypeinfo_t *texinfo = R_GetTexTypeInfo(textype, flags);
- while ((width * texinfo->internalbytesperpixel) & 3)
- width++;
- return width;
+ return rt ? ((gltexture_t *)rt)->inputheight : 0;
}
-void R_UpdateTexture(rtexture_t *rt, qbyte *data)
+void R_UpdateTexture(rtexture_t *rt, unsigned char *data, int x, int y, int width, int height)
{
gltexture_t *glt;
if (rt == NULL)
- Host_Error("R_UpdateTexture: no texture supplied\n");
+ Host_Error("R_UpdateTexture: no texture supplied");
if (data == NULL)
- Host_Error("R_UpdateTexture: no data supplied\n");
+ Host_Error("R_UpdateTexture: no data supplied");
glt = (gltexture_t *)rt;
- // 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);
+ // we need it to be uploaded before we can update a part of it
+ if (glt->flags & GLTEXF_UPLOAD)
+ R_UploadTexture(glt);
+
+ // update part of the texture
+ R_Upload(glt, data, x, y, 0, width, height, 1);
}
projects / xonotic / darkplaces.git / blobdiff