X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=1a2889e7a74c7cf40d1a35b3b83cdc08b109aa9f;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hp=4c9b11ac4f5a33b230ba0a45eb3d731a3e1b1eb7;hpb=5825444e7bcedf2968e80e5e22b2a79d851a7f1f;p=xonotic%2Fdarkplaces.git diff --git a/gl_textures.c b/gl_textures.c index 4c9b11ac..1a2889e7 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -3,20 +3,18 @@ #include "image.h" #include "jpeg.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 gl_max_size = {CVAR_SAVE, "gl_max_size", "2048"}; +cvar_t gl_max_scrapsize = {CVAR_SAVE, "gl_max_scrapsize", "256"}; +cvar_t gl_picmip = {CVAR_SAVE, "gl_picmip", "0"}; cvar_t r_lerpimages = {CVAR_SAVE, "r_lerpimages", "1"}; cvar_t r_precachetextures = {CVAR_SAVE, "r_precachetextures", "1"}; -cvar_t gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "0"}; +cvar_t gl_texture_anisotropy = {CVAR_SAVE, "gl_texture_anisotropy", "1"}; 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 @@ -29,7 +27,7 @@ static mempool_t *textureprocessingmempool; // size of images which hold fragment textures, ignores picmip and max_size static int block_size; -typedef struct +typedef struct textypeinfo_s { int textype; int inputbytesperpixel; @@ -100,12 +98,12 @@ typedef struct gltexture_s // pointer into gltextureimage array gltextureimage_t *image; // name of the texture (this might be removed someday), no duplicates - char *identifier; + char identifier[32]; // location in the image, and size int x, y, z, width, height, depth; // copy of the original texture(s) supplied to the upload function, for // delayed uploads (non-precached) - qbyte *inputtexels; + unsigned char *inputtexels; // original data size in *inputtexels int inputdatasize; // flags supplied to the LoadTexture function @@ -133,9 +131,9 @@ gltexturepool_t; 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; @@ -240,42 +238,24 @@ void R_FreeTexture(rtexture_t *rt) else Host_Error("R_FreeTexture: image not linked in pool\n"); if (image->texnum) - qglDeleteTextures(1, &image->texnum); + qglDeleteTextures(1, (GLuint *)&image->texnum); if (image->blockallocation) Mem_Free(image->blockallocation); Mem_Free(image); } } - if (glt->identifier) - Mem_Free(glt->identifier); if (glt->inputtexels) Mem_Free(glt->inputtexels); Mem_Free(glt); } -/* -static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier) -{ - gltexture_t *glt; - - if (!identifier) - return NULL; - - for (glt = pool->gltchain;glt;glt = glt->chain) - if (glt->identifier && !strcmp (identifier, glt->identifier)) - return glt; - - return NULL; -} -*/ - rtexturepool_t *R_AllocTexturePool(void) { gltexturepool_t *pool; 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; @@ -303,12 +283,12 @@ void R_FreeTexturePool(rtexturepool_t **rtexturepool) while (pool->gltchain) R_FreeTexture((rtexture_t *)pool->gltchain); if (pool->imagechain) - Sys_Error("R_FreeTexturePool: not all images freed\n"); + Con_Printf("R_FreeTexturePool: not all images freed\n"); Mem_Free(pool); } -typedef struct +typedef struct glmode_s { char *name; int minification, magnification; @@ -338,11 +318,11 @@ static void GL_TextureMode_f (void) { 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; } @@ -351,7 +331,7 @@ static void GL_TextureMode_f (void) break; if (i == 6) { - Con_Printf ("bad filter name\n"); + Con_Print("bad filter name\n"); return; } @@ -365,7 +345,7 @@ static void GL_TextureMode_f (void) for (image = pool->imagechain;image;image = image->imagechain) { // only update already uploaded images - if (!(image->flags & GLTEXF_UPLOAD)) + if (!(image->flags & GLTEXF_UPLOAD) && !(image->flags & (TEXF_FORCENEAREST | TEXF_FORCELINEAR))) { qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum); qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum); @@ -382,20 +362,23 @@ static void GL_TextureMode_f (void) static int R_CalcTexelDataSize (gltexture_t *glt) { - int width2, height2, depth2, size; + int width2, height2, depth2, size, picmip; if (glt->flags & TEXF_FRAGMENT) size = glt->width * glt->height * glt->depth; else { - if (r_max_size.integer > realmaxsize) - Cvar_SetValue("r_max_size", realmaxsize); + picmip = 0; + if (glt->flags & TEXF_PICMIP) + picmip = gl_picmip.integer; + if (gl_max_size.integer > realmaxsize) + Cvar_SetValue("gl_max_size", realmaxsize); // calculate final size for (width2 = 1;width2 < glt->width;width2 <<= 1); for (height2 = 1;height2 < glt->height;height2 <<= 1); for (depth2 = 1;depth2 < glt->depth;depth2 <<= 1); - for (width2 >>= r_picmip.integer;width2 > r_max_size.integer;width2 >>= 1); - for (height2 >>= r_picmip.integer;height2 > r_max_size.integer;height2 >>= 1); - for (depth2 >>= r_picmip.integer;depth2 > r_max_size.integer;depth2 >>= 1); + for (width2 >>= picmip;width2 > gl_max_size.integer;width2 >>= 1); + for (height2 >>= picmip;height2 > gl_max_size.integer;height2 >>= 1); + for (depth2 >>= picmip;depth2 > gl_max_size.integer;depth2 >>= 1); if (width2 < 1) width2 = 1; if (height2 < 1) height2 = 1; if (depth2 < 1) depth2 = 1; @@ -423,50 +406,58 @@ static int R_CalcTexelDataSize (gltexture_t *glt) return size; } -void R_TextureStats_PrintTotal(void) +void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean printtotal) { - int glsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0; + int glsize; + int isloaded; + int pooltotal = 0, pooltotalt = 0, pooltotalp = 0, poolloaded = 0, poolloadedt = 0, poolloadedp = 0; + int sumtotal = 0, sumtotalt = 0, sumtotalp = 0, sumloaded = 0, sumloadedt = 0, sumloadedp = 0; gltexture_t *glt; gltexturepool_t *pool; + if (printeach) + Con_Print("glsize input loaded mip alpha name\n"); for (pool = gltexturepoolchain;pool;pool = pool->next) { + pooltotal = 0; + pooltotalt = 0; + pooltotalp = 0; + poolloaded = 0; + poolloadedt = 0; + poolloadedp = 0; for (glt = pool->gltchain;glt;glt = glt->chain) { glsize = R_CalcTexelDataSize(glt); - total++; - totalt += glsize; - totalp += glt->inputdatasize; - if (!(glt->flags & GLTEXF_UPLOAD)) + isloaded = !(glt->flags & GLTEXF_UPLOAD); + pooltotal++; + pooltotalt += glsize; + pooltotalp += glt->inputdatasize; + if (isloaded) { - loaded++; - loadedt += glsize; - loadedp += glt->inputdatasize; + poolloaded++; + poolloadedt += glsize; + poolloadedp += glt->inputdatasize; } + if (printeach) + Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", isloaded ? '[' : ' ', (glsize + 1023) / 1024, isloaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', isloaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier); } + if (printpool) + Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0); + sumtotal += pooltotal; + sumtotalt += pooltotalt; + sumtotalp += pooltotalp; + sumloaded += poolloaded; + sumloadedt += poolloadedt; + sumloadedp += poolloadedp; } - Con_Printf("total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", total, totalt / 1048576.0, totalp / 1048576.0, loaded, loadedt / 1048576.0, loadedp / 1048576.0, total - loaded, (totalt - loadedt) / 1048576.0, (totalp - loadedp) / 1048576.0); + if (printtotal) + Con_Printf("textures total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", sumtotal, sumtotalt / 1048576.0, sumtotalp / 1048576.0, sumloaded, sumloadedt / 1048576.0, sumloadedp / 1048576.0, sumtotal - sumloaded, (sumtotalt - sumloadedt) / 1048576.0, (sumtotalp - sumloadedp) / 1048576.0); } static void R_TextureStats_f(void) { - int loaded; - gltexture_t *glt; - gltexturepool_t *pool; - Con_Printf("glsize input loaded mip alpha name\n"); - for (pool = gltexturepoolchain;pool;pool = pool->next) - { - for (glt = pool->gltchain;glt;glt = glt->chain) - { - loaded = !(glt->flags & GLTEXF_UPLOAD); - Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : ""); - } - 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) @@ -477,11 +468,9 @@ static void r_textures_start(void) 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); + for (block_size = 1;block_size < realmaxsize && block_size < gl_max_scrapsize.integer;block_size <<= 1); - texturemempool = Mem_AllocPool("Texture Info"); - texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)"); - textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers"); + texturemempool = Mem_AllocPool("texture management", 0, NULL); // Disable JPEG screenshots if the DLL isn't loaded if (! JPEG_OpenLibrary ()) @@ -506,8 +495,6 @@ static void r_textures_shutdown(void) colorconvertbuffer = NULL; texturebuffer = NULL; Mem_FreePool(&texturemempool); - Mem_FreePool(&texturedatamempool); - Mem_FreePool(&textureprocessingmempool); } static void r_textures_newmap(void) @@ -518,9 +505,9 @@ 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); + Cvar_RegisterVariable (&gl_max_scrapsize); + Cvar_RegisterVariable (&gl_max_size); + Cvar_RegisterVariable (&gl_picmip); Cvar_RegisterVariable (&r_lerpimages); Cvar_RegisterVariable (&r_precachetextures); Cvar_RegisterVariable (&gl_texture_anisotropy); @@ -530,6 +517,8 @@ void R_Textures_Init (void) void R_Textures_Frame (void) { + static int old_aniso = 0; + // could do procedural texture animation here, if we keep track of which // textures were accessed this frame... @@ -545,6 +534,34 @@ void R_Textures_Frame (void) Mem_Free(colorconvertbuffer); colorconvertbuffer = NULL; } + + if (old_aniso != gl_texture_anisotropy.integer) + { + gltextureimage_t *image; + gltexturepool_t *pool; + GLint oldbindtexnum; + + old_aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy); + + Cvar_SetValueQuick(&gl_texture_anisotropy, old_aniso); + + for (pool = gltexturepoolchain;pool;pool = pool->next) + { + for (image = pool->imagechain;image;image = image->imagechain) + { + // only update already uploaded images + if (!(image->flags & GLTEXF_UPLOAD) && (image->flags & TEXF_MIPMAP)) + { + qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum); + + qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum); + qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAX_ANISOTROPY_EXT, old_aniso);CHECKGLERROR + + qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum); + } + } + } + } } void R_MakeResizeBufferBigger(int size) @@ -556,8 +573,8 @@ void R_MakeResizeBufferBigger(int size) 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"); } @@ -570,51 +587,73 @@ static void GL_SetupTextureParameters(int flags, int texturetype) CHECKGLERROR - if (gl_support_anisotropy) - qglTexParameterf(textureenum, GL_TEXTURE_MAX_ANISOTROPY_EXT, gl_texture_anisotropy.value); - qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode); - qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode); + if (gl_support_anisotropy && (flags & TEXF_MIPMAP)) + { + 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 + } + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);CHECKGLERROR + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);CHECKGLERROR if (gltexturetypedimensions[texturetype] >= 3) - qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode); + { + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode);CHECKGLERROR + } + CHECKGLERROR if (flags & TEXF_FORCENEAREST) { if (flags & TEXF_MIPMAP) - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);CHECKGLERROR + } else - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST);CHECKGLERROR + } + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST);CHECKGLERROR } else if (flags & TEXF_FORCELINEAR) { if (flags & TEXF_MIPMAP) { 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); + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);CHECKGLERROR + } else - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);CHECKGLERROR + } } else - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);CHECKGLERROR + } + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);CHECKGLERROR } else { if (flags & TEXF_MIPMAP) - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min); + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min);CHECKGLERROR + } else - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag); + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag);CHECKGLERROR + } + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR } CHECKGLERROR } -static void R_Upload(gltexture_t *glt, qbyte *data) +static void R_Upload(gltexture_t *glt, unsigned char *data) { int i, mip, width, height, depth; GLint oldbindtexnum; - qbyte *prevbuffer; + unsigned char *prevbuffer; prevbuffer = data; CHECKGLERROR @@ -631,7 +670,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) if (glt->image->flags & GLTEXF_UPLOAD) { glt->image->flags &= ~GLTEXF_UPLOAD; - Con_DPrintf("uploaded new fragments image\n"); + Con_DPrint("uploaded new fragments image\n"); R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel); memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel); switch(glt->image->texturetype) @@ -658,7 +697,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) if (prevbuffer == NULL) { R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel); - memset(resizebuffer, 255, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel); + memset(resizebuffer, 0, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel); prevbuffer = resizebuffer; } else if (glt->textype->textype == TEXTYPE_PALETTE) @@ -705,7 +744,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) width = glt->image->width; height = glt->image->height; depth = glt->image->depth; - memset(resizebuffer, 255, width * height * depth * glt->image->bytesperpixel); + memset(resizebuffer, 0, width * height * depth * glt->image->bytesperpixel); prevbuffer = resizebuffer; } else @@ -786,7 +825,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) for (i = 0;i < 6;i++) { prevbuffer = texturebuffer; - texturebuffer += width * height * depth * glt->textype->inputbytesperpixel; + texturebuffer += glt->width * glt->height * glt->depth * glt->textype->inputbytesperpixel; if (glt->width != width || glt->height != height || glt->depth != depth) { Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer); @@ -821,7 +860,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) static void R_FindImageForTexture(gltexture_t *glt) { - int i, j, best, best2, x, y, z, w, h, d; + int i, j, best, best2, x, y, z, w, h, d, picmip; textypeinfo_t *texinfo; gltexturepool_t *pool; gltextureimage_t *image, **imagechainpointer; @@ -846,7 +885,7 @@ static void R_FindImageForTexture(gltexture_t *glt) continue; if (image->texturetype != glt->texturetype) continue; - if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) + if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)) continue; if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat) continue; @@ -885,9 +924,12 @@ static void R_FindImageForTexture(gltexture_t *glt) return; } - image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t)); + image = (gltextureimage_t *)Mem_Alloc(texturemempool, sizeof(gltextureimage_t)); if (image == NULL) - Sys_Error("R_FindImageForTexture: ran out of memory\n"); + { + Con_Printf ("R_FindImageForTexture: ran out of memory\n"); + return; + } image->type = GLIMAGETYPE_FRAGMENTS; // make sure the created image is big enough for the fragment for (image->width = block_size;image->width < glt->width;image->width <<= 1); @@ -897,7 +939,7 @@ static void R_FindImageForTexture(gltexture_t *glt) image->depth = 1; if (gltexturetypedimensions[glt->texturetype] >= 3) for (image->depth = block_size;image->depth < glt->depth;image->depth <<= 1); - image->blockallocation = Mem_Alloc(texturemempool, image->width * sizeof(short)); + image->blockallocation = (short int *)Mem_Alloc(texturemempool, image->width * sizeof(short)); memset(image->blockallocation, 0, image->width * sizeof(short)); x = 0; @@ -910,21 +952,27 @@ static void R_FindImageForTexture(gltexture_t *glt) { for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain); - image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t)); + image = (gltextureimage_t *)Mem_Alloc(texturemempool, sizeof(gltextureimage_t)); if (image == NULL) - Sys_Error("R_FindImageForTexture: ran out of memory\n"); + { + Con_Printf ("R_FindImageForTexture: ran out of memory\n"); + return; + } image->type = GLIMAGETYPE_TILE; image->blockallocation = NULL; + picmip = 0; + if (glt->flags & TEXF_PICMIP) + picmip = gl_picmip.integer; // calculate final size - if (r_max_size.integer > realmaxsize) - Cvar_SetValue("r_max_size", realmaxsize); + if (gl_max_size.integer > realmaxsize) + Cvar_SetValue("gl_max_size", realmaxsize); for (image->width = 1;image->width < glt->width;image->width <<= 1); for (image->height = 1;image->height < glt->height;image->height <<= 1); for (image->depth = 1;image->depth < glt->depth;image->depth <<= 1); - for (image->width >>= 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); - for (image->depth >>= r_picmip.integer;image->depth > r_max_size.integer;image->depth >>= 1); + for (image->width >>= picmip;image->width > gl_max_size.integer;image->width >>= 1); + for (image->height >>= picmip;image->height > gl_max_size.integer;image->height >>= 1); + for (image->depth >>= picmip;image->depth > gl_max_size.integer;image->depth >>= 1); if (image->width < 1) image->width = 1; if (image->height < 1) image->height = 1; if (image->depth < 1) image->depth = 1; @@ -932,17 +980,17 @@ static void R_FindImageForTexture(gltexture_t *glt) image->texturetype = glt->texturetype; image->glinternalformat = texinfo->glinternalformat; image->glformat = texinfo->glformat; - image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) | GLTEXF_UPLOAD; + image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)) | GLTEXF_UPLOAD; image->bytesperpixel = texinfo->internalbytesperpixel; image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1; // get a texture number to use - qglGenTextures(1, &image->texnum); + qglGenTextures(1, (GLuint *)&image->texnum); *imagechainpointer = image; image->texturecount++; glt->x = x; glt->y = y; - glt->y = z; + glt->z = z; glt->image = image; } @@ -963,7 +1011,7 @@ static void R_UploadTexture (gltexture_t *glt) Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier); } -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 qbyte *data, const unsigned int *palette) +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, size; gltexture_t *glt; @@ -974,25 +1022,28 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden return NULL; if (flags & TEXF_FRAGMENT && texturetype != GLTEXTURETYPE_2D) - Sys_Error("R_LoadTexture: only 2D fragment textures implemented\n"); + { + Con_Printf ("R_LoadTexture: only 2D fragment textures implemented\n"); + return NULL; + } if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap) - Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n"); + { + Con_Printf ("R_LoadTexture: cubemap texture not supported by driver\n"); + return NULL; + } if (texturetype == GLTEXTURETYPE_3D && !gl_texture3d) - Sys_Error("R_LoadTexture: 3d texture not supported by driver\n"); - - /* - glt = R_FindTexture (pool, identifier); - if (glt) { - Con_Printf("R_LoadTexture: replacing existing texture %s\n", identifier); - R_FreeTexture((rtexture_t *)glt); + Con_Printf ("R_LoadTexture: 3d texture not supported by driver\n"); + return NULL; } - */ texinfo = R_GetTexTypeInfo(textype, flags); size = width * height * depth * sides * texinfo->inputbytesperpixel; if (size < 1) - Sys_Error("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides); + { + Con_Printf ("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides); + return NULL; + } // clear the alpha flag if the texture has no transparent pixels switch(textype) @@ -1005,7 +1056,7 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden { for (i = 0;i < size;i++) { - if (((qbyte *)&palette[data[i]])[3] < 255) + if (((unsigned char *)&palette[data[i]])[3] < 255) { flags |= TEXF_ALPHA; break; @@ -1041,14 +1092,9 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden Host_Error("R_LoadTexture: unknown texture type\n"); } - glt = Mem_Alloc(texturemempool, sizeof(gltexture_t)); + glt = (gltexture_t *)Mem_Alloc(texturemempool, sizeof(gltexture_t)); if (identifier) - { - glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1); - strcpy (glt->identifier, identifier); - } - else - glt->identifier = NULL; + strlcpy (glt->identifier, identifier, sizeof(glt->identifier)); glt->pool = pool; glt->chain = pool->gltchain; pool->gltchain = glt; @@ -1063,10 +1109,11 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden if (data) { - glt->inputtexels = Mem_Alloc(texturedatamempool, size); + glt->inputtexels = (unsigned char *)Mem_Alloc(texturemempool, size); if (glt->inputtexels == NULL) - Sys_Error("R_LoadTexture: out of memory\n"); - memcpy(glt->inputtexels, data, size); + Con_Printf ("R_LoadTexture: out of memory\n"); + else + memcpy(glt->inputtexels, data, size); } else glt->inputtexels = NULL; @@ -1077,22 +1124,22 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden return (rtexture_t *)glt; } -rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette) +rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette) { return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data, palette); } -rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const qbyte *data, int textype, int flags, const unsigned int *palette) +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); } -rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const qbyte *data, int textype, int flags, const unsigned int *palette) +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) { return R_SetupTexture(rtexturepool, identifier, width, height, depth, 1, flags, textype, GLTEXTURETYPE_3D, data, palette); } -rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette) +rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, int textype, int flags, const unsigned int *palette) { return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, palette); } @@ -1205,7 +1252,7 @@ int R_CompatibleFragmentWidth(int width, int textype, int flags) return width; } -void R_UpdateTexture(rtexture_t *rt, qbyte *data) +void R_UpdateTexture(rtexture_t *rt, unsigned char *data) { gltexture_t *glt; if (rt == NULL)