X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_textures.c;h=c0493bd86d79740bb9d33885477e47ef4b8c8a81;hp=edd0b7dbac9ba494ea1774fe31567f2ca819c61f;hb=6f079ecb90e1e6b7597d4da1a98f95c5822aad8d;hpb=70f117c8c62d425f592afb8ddb0e1b252e2d244b diff --git a/gl_textures.c b/gl_textures.c index edd0b7db..c0493bd8 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -1,20 +1,20 @@ #include "quakedef.h" #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", "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 @@ -37,11 +37,12 @@ typedef struct } textypeinfo_t; -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}; +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}; +static textypeinfo_t textype_dsdt = {TEXTYPE_DSDT , 2, 2, GL_DSDT_NV, GL_DSDT8_NV}; // a tiling texture (most common type) #define GLIMAGETYPE_TILE 0 @@ -54,6 +55,7 @@ static textypeinfo_t textype_rgba_alpha = {TEXTYPE_RGBA , 4, 4, GL_RGBA, 4} #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] = { @@ -96,7 +98,7 @@ 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 @@ -120,7 +122,7 @@ gltexture_t; typedef struct gltexturepool_s { - int sentinel; + unsigned int sentinel; struct gltextureimage_s *imagechain; struct gltexture_s *gltchain; struct gltexturepool_s *next; @@ -164,6 +166,8 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags) return &textype_rgb; case TEXTYPE_RGBA: return &textype_rgba; + case TEXTYPE_DSDT: + return &textype_dsdt; default: Host_Error("R_GetTexTypeInfo: unknown texture format\n"); return NULL; @@ -241,29 +245,11 @@ void R_FreeTexture(rtexture_t *rt) } } - 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; @@ -297,7 +283,7 @@ 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); } @@ -319,11 +305,10 @@ static glmode_t modes[] = {"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR} }; -extern int gl_backend_rebindtextures; - static void GL_TextureMode_f (void) { int i; + GLint oldbindtexnum; gltextureimage_t *image; gltexturepool_t *pool; @@ -333,20 +318,20 @@ 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; } 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; } @@ -360,36 +345,40 @@ 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))) { - qglBindTexture(GL_TEXTURE_2D, image->texnum); + qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum); + qglBindTexture(gltexturetypeenums[image->texturetype], image->texnum); if (image->flags & TEXF_MIPMAP) - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min); + qglTexParameteri(gltexturetypeenums[image->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[image->texturetype], GL_TEXTURE_MIN_FILTER, gl_filter_mag); + qglTexParameteri(gltexturetypeenums[image->texturetype], GL_TEXTURE_MAG_FILTER, gl_filter_mag); + qglBindTexture(gltexturetypeenums[image->texturetype], oldbindtexnum); } } } - gl_backend_rebindtextures = true; } 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; @@ -417,46 +406,56 @@ 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]; @@ -471,16 +470,21 @@ 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 management", 0, NULL); - texturemempool = Mem_AllocPool("Texture Info"); - texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)"); - textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers"); + // Disable JPEG screenshots if the DLL isn't loaded + if (! JPEG_OpenLibrary ()) + Cvar_SetValueQuick (&scr_screenshot_jpeg, 0); } static void r_textures_shutdown(void) { rtexturepool_t *temp; + + JPEG_CloseLibrary (); + while(gltexturepoolchain) { temp = (rtexturepool_t *) gltexturepoolchain; @@ -493,8 +497,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) @@ -505,17 +507,20 @@ 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); R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap); } 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... @@ -531,6 +536,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) @@ -542,8 +575,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 = Mem_Alloc(texturemempool, resizebuffersize); + colorconvertbuffer = Mem_Alloc(texturemempool, resizebuffersize); if (!resizebuffer || !colorconvertbuffer) Host_Error("R_Upload: out of memory\n"); } @@ -552,44 +585,94 @@ void R_MakeResizeBufferBigger(int size) static void GL_SetupTextureParameters(int flags, int texturetype) { int textureenum = gltexturetypeenums[texturetype]; - int wrapmode = (flags & TEXF_CLAMP) ? GL_CLAMP : GL_REPEAT; + int wrapmode = ((flags & TEXF_CLAMP) && gl_support_clamptoedge) ? GL_CLAMP_TO_EDGE : GL_REPEAT; CHECKGLERROR - 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 + } - if (flags & TEXF_MIPMAP) - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min); + CHECKGLERROR + if (flags & TEXF_FORCENEAREST) + { + if (flags & TEXF_MIPMAP) + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);CHECKGLERROR + } + else + { + 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);CHECKGLERROR + } + else + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);CHECKGLERROR + } + } + else + { + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR);CHECKGLERROR + } + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR);CHECKGLERROR + } else - qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag); - qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag); + { + 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_Upload(gltexture_t *glt, qbyte *data) { - int i, mip, width, height, depth, internalformat; + int i, mip, width, height, depth; + GLint oldbindtexnum; qbyte *prevbuffer; prevbuffer = data; CHECKGLERROR glt->texnum = glt->image->texnum; + // we need to restore the texture binding after finishing the upload + qglGetIntegerv(gltexturetypebindingenums[glt->image->texturetype], &oldbindtexnum); qglBindTexture(gltexturetypeenums[glt->image->texturetype], glt->image->texnum); CHECKGLERROR glt->flags &= ~GLTEXF_UPLOAD; - gl_backend_rebindtextures = true; if (glt->flags & TEXF_FRAGMENT) { 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) @@ -616,7 +699,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) @@ -646,124 +729,85 @@ static void R_Upload(gltexture_t *glt, qbyte *data) Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n"); break; } - glt->texnum = glt->image->texnum; - return; - } - - glt->image->flags &= ~GLTEXF_UPLOAD; - - // 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); - for (depth = 1;depth < glt->depth ;depth <<= 1); - - R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel); - - if (prevbuffer == NULL) - { - width = glt->image->width; - height = glt->image->height; - depth = glt->image->depth; - memset(resizebuffer, 255, width * height * depth * glt->image->bytesperpixel); - prevbuffer = resizebuffer; } else { - if (glt->textype->textype == TEXTYPE_PALETTE) - { - // 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 * glt->depth * glt->image->sides, glt->palette); - prevbuffer = colorconvertbuffer; - } - } + glt->image->flags &= ~GLTEXF_UPLOAD; - // 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; + // 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); + for (depth = 1;depth < glt->depth ;depth <<= 1); - // cubemaps contain multiple images and thus get processed a bit differently - if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP) - { - 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); - prevbuffer = resizebuffer; - } - // picmip/max_size - while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth) + R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel); + + if (prevbuffer == NULL) { - Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel); + width = glt->image->width; + height = glt->image->height; + depth = glt->image->depth; + memset(resizebuffer, 0, width * height * depth * glt->image->bytesperpixel); prevbuffer = resizebuffer; } - } - mip = 0; - switch(glt->image->texturetype) - { - case GLTEXTURETYPE_1D: - qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR - if (glt->flags & TEXF_MIPMAP) + else { - while (width > 1 || height > 1 || depth > 1) + if (glt->textype->textype == TEXTYPE_PALETTE) { - Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel); - prevbuffer = resizebuffer; - qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + // 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 * glt->depth * glt->image->sides, glt->palette); + prevbuffer = colorconvertbuffer; } } - break; - case GLTEXTURETYPE_2D: - qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR - if (glt->flags & TEXF_MIPMAP) + + // cubemaps contain multiple images and thus get processed a bit differently + if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP) { - while (width > 1 || height > 1 || depth > 1) + if (glt->width != width || glt->height != height || glt->depth != depth) { - Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel); + Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer); prevbuffer = resizebuffer; - qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR } - } - break; - case GLTEXTURETYPE_3D: - qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR - if (glt->flags & TEXF_MIPMAP) - { - while (width > 1 || height > 1 || depth > 1) + // picmip/max_size + while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth) { - Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel); + Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel); prevbuffer = resizebuffer; - qglTexImage3D(GL_TEXTURE_3D, mip++, internalformat, width, height, depth, 0, glt->image->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++) + mip = 0; + switch(glt->image->texturetype) { - prevbuffer = texturebuffer; - texturebuffer += width * height * depth * glt->textype->inputbytesperpixel; - if (glt->width != width || glt->height != height || glt->depth != depth) + case GLTEXTURETYPE_1D: + qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + if (glt->flags & TEXF_MIPMAP) { - Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer); - prevbuffer = resizebuffer; + while (width > 1 || height > 1 || depth > 1) + { + Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel); + prevbuffer = resizebuffer; + qglTexImage1D(GL_TEXTURE_1D, mip++, glt->image->glinternalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + } } - // picmip/max_size - while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth) + break; + case GLTEXTURETYPE_2D: + qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + if (glt->flags & TEXF_MIPMAP) { - Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel); - prevbuffer = resizebuffer; + while (width > 1 || height > 1 || depth > 1) + { + Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel); + prevbuffer = resizebuffer; + qglTexImage2D(GL_TEXTURE_2D, mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + } } - mip = 0; - qglTexImage2D(cubemapside[i], mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + break; + case GLTEXTURETYPE_3D: + qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR if (glt->flags & TEXF_MIPMAP) { @@ -771,19 +815,54 @@ static void R_Upload(gltexture_t *glt, qbyte *data) { Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel); prevbuffer = resizebuffer; - qglTexImage2D(cubemapside[i], mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + qglTexImage3D(GL_TEXTURE_3D, mip++, glt->image->glinternalformat, width, height, depth, 0, glt->image->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->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); + prevbuffer = resizebuffer; + } + // picmip/max_size + while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth) + { + Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel); + prevbuffer = resizebuffer; + } + mip = 0; + qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->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->image->bytesperpixel); + prevbuffer = resizebuffer; + qglTexImage2D(cubemapside[i], mip++, glt->image->glinternalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + } + } + } + break; } - break; + GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype); } - GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype); + qglBindTexture(gltexturetypeenums[glt->image->texturetype], oldbindtexnum); } 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; @@ -808,7 +887,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; @@ -849,7 +928,10 @@ static void R_FindImageForTexture(gltexture_t *glt) image = 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); @@ -874,19 +956,25 @@ static void R_FindImageForTexture(gltexture_t *glt) image = 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; @@ -894,7 +982,7 @@ 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 @@ -936,23 +1024,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) + { + 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) @@ -965,7 +1058,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 (((qbyte *)&palette[data[i]])[3] < 255) { flags |= TEXF_ALPHA; break; @@ -995,18 +1088,15 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden } } break; + case TEXTYPE_DSDT: + break; default: Host_Error("R_LoadTexture: unknown texture type\n"); } 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; + strlcpy (glt->identifier, identifier, sizeof(glt->identifier)); glt->pool = pool; glt->chain = pool->gltchain; pool->gltchain = glt; @@ -1021,10 +1111,11 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden if (data) { - glt->inputtexels = Mem_Alloc(texturedatamempool, size); + glt->inputtexels = Mem_Alloc(texturemempool, size); if (glt->inputtexels == NULL) - Sys_Error("R_SetupTexture: 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;