X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=cab9f636b450bd135bb4be3df5b18eda327d8ffb;hb=17837f58260f8fa29420cba9b95ee10f74612335;hp=8aa0457f31984dc5ad961b4e1026d3f58bbb4415;hpb=31ad3dd6c6d2d35ef22a6e88205fe0926b1e0150;p=xonotic%2Fdarkplaces.git diff --git a/gl_textures.c b/gl_textures.c index 8aa0457f..cab9f636 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -1,5 +1,7 @@ #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"}; @@ -26,13 +28,6 @@ static mempool_t *textureprocessingmempool; // size of images which hold fragment textures, ignores picmip and max_size 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 { int textype; @@ -40,34 +35,52 @@ typedef struct 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}; +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}; // a tiling texture (most common type) #define GLIMAGETYPE_TILE 0 // a fragments texture (contains one or more fragment textures) #define GLIMAGETYPE_FRAGMENTS 1 +#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 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 { struct gltextureimage_s *imagechain; int texturecount; int type; // one of the GLIMAGETYPE_ values + int texturetype; // one of the GLTEXTURETYPE_ values + int sides; // 1 or 6 depending on texturetype int texnum; // GL texture slot number - int width, height; + int width, height, depth; // 3D texture support int bytesperpixel; // bytes per pixel int glformat; // GL_RGB or GL_RGBA int glinternalformat; // 3 or 4 int flags; - short *blockallocation; // fragment allocation + short *blockallocation; // fragment allocation (2D only) } gltextureimage_t; @@ -86,16 +99,21 @@ typedef struct gltexture_s // 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) + 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; - // to identify cache mismatchs (this might be removed someday) - int crc; + // 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; // 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; } gltexture_t; @@ -103,7 +121,7 @@ gltexture_t; typedef struct gltexturepool_s { - int sentinel; + unsigned int sentinel; struct gltextureimage_s *imagechain; struct gltexture_s *gltchain; struct gltexturepool_s *next; @@ -125,8 +143,8 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags) { 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"); return NULL; @@ -141,8 +159,8 @@ static textypeinfo_t *R_GetTexTypeInfo(int textype, int flags) { switch(textype) { - case TEXTYPE_QPALETTE: - return &textype_qpalette; + case TEXTYPE_PALETTE: + return &textype_palette; case TEXTYPE_RGB: return &textype_rgb; case TEXTYPE_RGBA: @@ -191,7 +209,6 @@ void R_FreeTexture(rtexture_t *rt) { gltexture_t *glt, **gltpointer; gltextureimage_t *image, **gltimagepointer; - GLuint texnum; glt = (gltexture_t *)rt; if (glt == NULL) @@ -206,24 +223,23 @@ void R_FreeTexture(rtexture_t *rt) // 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) + if (glt->image) { - 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) + image = glt->image; + image->texturecount--; + if (image->texturecount < 1) { - texnum = image->texnum; - gltexnuminuse[image->texnum] = 0; - qglDeleteTextures(1, &texnum); + 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) + qglDeleteTextures(1, &image->texnum); + if (image->blockallocation) + Mem_Free(image->blockallocation); + Mem_Free(image); } - if (image->blockallocation) - Mem_Free(image->blockallocation); - Mem_Free(image); } if (glt->identifier) @@ -233,6 +249,7 @@ void R_FreeTexture(rtexture_t *rt) Mem_Free(glt); } +/* static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier) { gltexture_t *glt; @@ -246,6 +263,7 @@ static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier) return NULL; } +*/ rtexturepool_t *R_AllocTexturePool(void) { @@ -325,7 +343,7 @@ static void GL_TextureMode_f (void) } 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) { @@ -359,9 +377,9 @@ static void GL_TextureMode_f (void) static int R_CalcTexelDataSize (gltexture_t *glt) { - int width2, height2, size; + int width2, height2, depth2, size; if (glt->flags & TEXF_FRAGMENT) - size = glt->width * glt->height; + size = glt->width * glt->height * glt->depth; else { if (r_max_size.integer > realmaxsize) @@ -369,35 +387,40 @@ static int R_CalcTexelDataSize (gltexture_t *glt) // 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); if (width2 < 1) width2 = 1; if (height2 < 1) height2 = 1; + if (depth2 < 1) depth2 = 1; size = 0; if (glt->flags & TEXF_MIPMAP) { - while (width2 > 1 || height2 > 1) + while (width2 > 1 || height2 > 1 || depth2 > 1) { - size += width2 * height2; + size += width2 * height2 * depth2; if (width2 > 1) width2 >>= 1; if (height2 > 1) height2 >>= 1; + if (depth2 > 1) + depth2 >>= 1; } size++; // count the last 1x1 mipmap } else - size = width2*height2; + size = width2 * height2 * depth2; } - size *= glt->textype->internalbytesperpixel; + size *= glt->textype->internalbytesperpixel * glt->image->sides; return size; } void R_TextureStats_PrintTotal(void) { - int glsize, inputsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0; + int glsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0; gltexture_t *glt; gltexturepool_t *pool; for (pool = gltexturepoolchain;pool;pool = pool->next) @@ -405,16 +428,14 @@ void R_TextureStats_PrintTotal(void) 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; + totalp += glt->inputdatasize; if (!(glt->flags & GLTEXF_UPLOAD)) { loaded++; loadedt += glsize; - loadedp += inputsize; + loadedp += glt->inputdatasize; } } } @@ -426,13 +447,13 @@ static void R_TextureStats_f(void) int loaded; gltexture_t *glt; gltexturepool_t *pool; - Con_Printf("glsize input crc loaded mip alpha name\n"); + 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 %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 : ""); + 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); } @@ -446,6 +467,9 @@ static void r_textures_start(void) // deal with size limits of various drivers (3dfx in particular) qglGetIntegerv(GL_MAX_TEXTURE_SIZE, &realmaxsize); CHECKGLERROR + // 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); @@ -453,12 +477,16 @@ static void r_textures_start(void) 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); + + JPEG_OpenLibrary (); } static void r_textures_shutdown(void) { rtexturepool_t *temp; + + JPEG_CloseLibrary (); + while(gltexturepoolchain) { temp = (rtexturepool_t *) gltexturepoolchain; @@ -470,7 +498,6 @@ static void r_textures_shutdown(void) resizebuffer = NULL; colorconvertbuffer = NULL; texturebuffer = NULL; - gltexnuminuse = NULL; Mem_FreePool(&texturemempool); Mem_FreePool(&texturedatamempool); Mem_FreePool(&textureprocessingmempool); @@ -482,14 +509,13 @@ static void r_textures_newmap(void) void R_Textures_Init (void) { - Cmd_AddCommand ("gl_texturemode", &GL_TextureMode_f); + 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 (&r_lerpimages); Cvar_RegisterVariable (&r_precachetextures); - gltexnuminuse = NULL; R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap); } @@ -529,52 +555,127 @@ void R_MakeResizeBufferBigger(int size) } } +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 + + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode); + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode); + if (gltexturetypedimensions[texturetype] >= 3) + qglTexParameteri(textureenum, GL_TEXTURE_WRAP_R, wrapmode); + + if (flags & TEXF_FORCENEAREST) + { + if (flags & TEXF_MIPMAP) + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); + else + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + } + 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); + else + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); + } + else + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + } + else + { + if (flags & TEXF_MIPMAP) + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_min); + else + qglTexParameteri(textureenum, GL_TEXTURE_MIN_FILTER, gl_filter_mag); + qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag); + } + + CHECKGLERROR +} + static void R_Upload(gltexture_t *glt, qbyte *data) { - int mip, width, height, internalformat; + int i, mip, width, height, depth, internalformat; qbyte *prevbuffer; prevbuffer = data; - qglBindTexture(GL_TEXTURE_2D, glt->image->texnum); CHECKGLERROR - gl_backend_rebindtextures = true; - + glt->texnum = glt->image->texnum; + 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) { - Con_DPrintf("uploaded new fragments image\n"); - R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel); 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 + Con_DPrintf("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) + { + case GLTEXTURETYPE_1D: + qglTexImage1D(GL_TEXTURE_1D, 0, glt->image->glinternalformat, glt->image->width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer); + CHECKGLERROR + break; + case GLTEXTURETYPE_2D: + qglTexImage2D(GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer); + CHECKGLERROR + break; + case GLTEXTURETYPE_3D: + qglTexImage3D(GL_TEXTURE_3D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, glt->image->depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer); + CHECKGLERROR + break; + default: + Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n"); + break; + } + GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype); } if (prevbuffer == NULL) { - R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel); - memset(resizebuffer, 255, glt->width * glt->height * glt->image->bytesperpixel); + 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); prevbuffer = resizebuffer; } - else if (glt->textype->textype == TEXTYPE_QPALETTE) + 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 - R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel); - Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table); + R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->sides * glt->image->bytesperpixel); + Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth, glt->palette); prevbuffer = colorconvertbuffer; } - qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); - CHECKGLERROR + switch(glt->image->texturetype) + { + case GLTEXTURETYPE_1D: + qglTexSubImage1D(GL_TEXTURE_1D, 0, glt->x, glt->width, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + break; + case GLTEXTURETYPE_2D: + qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + break; + case GLTEXTURETYPE_3D: + qglTexSubImage3D(GL_TEXTURE_3D, 0, glt->x, glt->y, glt->z, glt->width, glt->height, glt->depth, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + break; + default: + Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n"); + break; + } glt->texnum = glt->image->texnum; return; } @@ -582,40 +683,29 @@ static void R_Upload(gltexture_t *glt, qbyte *data) 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 (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 * glt->image->bytesperpixel); + R_MakeResizeBufferBigger(width * height * depth * glt->image->sides * glt->image->bytesperpixel); if (prevbuffer == NULL) { width = glt->image->width; height = glt->image->height; - memset(resizebuffer, 255, width * height * glt->image->bytesperpixel); + depth = glt->image->depth; + memset(resizebuffer, 255, width * height * depth * glt->image->bytesperpixel); prevbuffer = resizebuffer; } else { - if (glt->textype->textype == TEXTYPE_QPALETTE) + 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, d_8to24table); + Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth * glt->image->sides, glt->palette); prevbuffer = colorconvertbuffer; } - - if (glt->width != width || glt->height != height) - { - Image_Resample(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel, r_lerpimages.integer); - prevbuffer = resizebuffer; - } - - // apply picmip/max_size limitations - while (width > glt->image->width || height > glt->image->height) - { - Image_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel); - prevbuffer = resizebuffer; - } } // 3 and 4 are converted by the driver to it's preferred format for the current display mode @@ -623,38 +713,107 @@ static void R_Upload(gltexture_t *glt, qbyte *data) 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) + // cubemaps contain multiple images and thus get processed a bit differently + if (glt->image->texturetype != GLTEXTURETYPE_CUBEMAP) { - while (width > 1 || height > 1) + if (glt->width != width || glt->height != height || glt->depth != depth) { - Image_MipReduce(prevbuffer, resizebuffer, &width, &height, 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; + } + // 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; - - qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); - 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 + mip = 0; + switch(glt->image->texturetype) { - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag); + case GLTEXTURETYPE_1D: + qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR - qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); + 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; + qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + } + } + 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) + { + 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++, 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) + { + Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, 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++) + { + prevbuffer = texturebuffer; + texturebuffer += width * height * 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++, internalformat, 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++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); + CHECKGLERROR + } + } + } + break; } - glt->texnum = glt->image->texnum; + GL_SetupTextureParameters(glt->image->flags, glt->image->texturetype); } static void R_FindImageForTexture(gltexture_t *glt) { - int i, j, best, best2, x, y, w, h; + int i, j, best, best2, x, y, z, w, h, d; textypeinfo_t *texinfo; gltexturepool_t *pool; gltextureimage_t *image, **imagechainpointer; @@ -666,8 +825,10 @@ static void R_FindImageForTexture(gltexture_t *glt) x = 0; y = 0; + z = 0; w = glt->width; h = glt->height; + d = glt->depth; if (glt->flags & TEXF_FRAGMENT) { for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain) @@ -675,13 +836,17 @@ static void R_FindImageForTexture(gltexture_t *glt) image = *imagechainpointer; if (image->type != GLIMAGETYPE_FRAGMENTS) continue; + if (image->texturetype != glt->texturetype) + continue; + if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) + continue; if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat) continue; - if (glt->width > image->width || glt->height > image->height) + if (glt->width > image->width || glt->height > image->height || glt->depth > image->depth) continue; // got a fragments texture, find a place in it if we can - for (best = image->width, i = 0;i < image->width - w;i += texinfo->align) + for (best = image->width, i = 0;i < image->width - w;i++) { for (best2 = 0, j = 0;j < w;j++) { @@ -706,6 +871,7 @@ static void R_FindImageForTexture(gltexture_t *glt) glt->x = x; glt->y = y; + glt->z = 0; glt->image = image; image->texturecount++; return; @@ -717,12 +883,18 @@ static void R_FindImageForTexture(gltexture_t *glt) 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); - for (image->height = block_size;image->height < glt->height;image->height <<= 1); + image->height = 1; + if (gltexturetypedimensions[glt->texturetype] >= 2) + for (image->height = block_size;image->height < glt->height;image->height <<= 1); + 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)); memset(image->blockallocation, 0, image->width * sizeof(short)); x = 0; y = 0; + z = 0; for (i = 0;i < w;i++) image->blockallocation[x + i] = y + h; } @@ -741,27 +913,28 @@ static void R_FindImageForTexture(gltexture_t *glt) 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->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); if (image->width < 1) image->width = 1; if (image->height < 1) image->height = 1; + if (image->depth < 1) image->depth = 1; } + image->texturetype = glt->texturetype; image->glinternalformat = texinfo->glinternalformat; image->glformat = texinfo->glformat; - image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA)) | GLTEXF_UPLOAD; + image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP)) | 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"); + image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1; + // get a texture number to use + qglGenTextures(1, &image->texnum); *imagechainpointer = image; image->texturecount++; glt->x = x; glt->y = y; + glt->y = z; glt->image = image; } @@ -782,77 +955,53 @@ 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 gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, qbyte *data) -{ - 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 (data) - { - 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 - glt->inputtexels = NULL; - - R_FindImageForTexture(glt); - R_PrecacheTexture(glt); - - return glt; -} - -/* -================ -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 qbyte *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 (flags & TEXF_FRAGMENT && texturetype != GLTEXTURETYPE_2D) + Sys_Error("R_LoadTexture: only 2D fragment textures implemented\n"); + if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap) + Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n"); + 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); + } + */ - if (flags & TEXF_FRAGMENT) - if ((width * texinfo->internalbytesperpixel) & 3) - Host_Error("R_LoadTexture: incompatible width for fragment"); + 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); // 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 (((qbyte *)&palette[data[i]])[3] < 255) + { + flags |= TEXF_ALPHA; + break; + } } } } @@ -865,12 +1014,15 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w 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; + } } } } @@ -879,70 +1031,103 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w Host_Error("R_LoadTexture: unknown texture type\n"); } - // LordHavoc: do a CRC to confirm the data really is the same as previous occurances. - if (data == NULL) - crc = 0; + glt = Mem_Alloc(texturemempool, sizeof(gltexture_t)); + if (identifier) + { + glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1); + strcpy (glt->identifier, identifier); + } else - crc = CRC_Block(data, width*height*texinfo->inputbytesperpixel); + glt->identifier = NULL; + glt->pool = pool; + glt->chain = pool->gltchain; + pool->gltchain = glt; + glt->width = width; + glt->height = height; + glt->depth = depth; + glt->flags = flags | GLTEXF_UPLOAD; + glt->textype = texinfo; + glt->texturetype = texturetype; + glt->inputdatasize = size; + glt->palette = palette; - // 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((rtexture_t *)glt); + glt->inputtexels = Mem_Alloc(texturedatamempool, size); + if (glt->inputtexels == NULL) + Sys_Error("R_LoadTexture: out of memory\n"); + memcpy(glt->inputtexels, data, size); } + else + glt->inputtexels = NULL; - return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data); + R_FindImageForTexture(glt); + R_PrecacheTexture(glt); + + 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) +{ + 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) +{ + 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) +{ + 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) +{ + return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data, palette); } int R_TextureHasAlpha(rtexture_t *rt) { - gltexture_t *glt; - if (!rt) - return false; - glt = (gltexture_t *)rt; - return (glt->flags & TEXF_ALPHA) != 0; + return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false; } int R_TextureWidth(rtexture_t *rt) { - if (!rt) - return false; - return ((gltexture_t *)rt)->width; + return rt ? ((gltexture_t *)rt)->width : 0; } int R_TextureHeight(rtexture_t *rt) { - if (!rt) - return false; - return ((gltexture_t *)rt)->height; + return rt ? ((gltexture_t *)rt)->height : 0; } -void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2) +void R_FragmentLocation3D(rtexture_t *rt, int *x, int *y, int *z, float *fx1, float *fy1, float *fz1, float *fx2, float *fy2, float *fz2) { gltexture_t *glt; - float iwidth, iheight; + float iwidth, iheight, idepth; if (cls.state == ca_dedicated) { if (x) *x = 0; if (y) *y = 0; + if (z) + *z = 0; if (fx1 || fy1 || fx2 || fy2) { if (fx1) *fx1 = 0; if (fy1) *fy1 = 0; + if (fz1) + *fz1 = 0; if (fx2) *fx2 = 1; if (fy2) *fy2 = 1; + if (fz2) + *fz2 = 1; } return; } @@ -959,14 +1144,19 @@ void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, { iwidth = 1.0f / glt->image->width; iheight = 1.0f / glt->image->height; + idepth = 1.0f / glt->image->depth; if (fx1) *fx1 = glt->x * iwidth; if (fy1) *fy1 = glt->y * iheight; + if (fz1) + *fz1 = glt->z * idepth; if (fx2) *fx2 = (glt->x + glt->width) * iwidth; if (fy2) *fy2 = (glt->y + glt->height) * iheight; + if (fz2) + *fz2 = (glt->z + glt->depth) * idepth; } } else @@ -975,25 +1165,33 @@ void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, *x = 0; if (y) *y = 0; + if (z) + *z = 0; if (fx1 || fy1 || fx2 || fy2) { if (fx1) *fx1 = 0; if (fy1) *fy1 = 0; + if (fz1) + *fz1 = 0; if (fx2) *fx2 = 1; if (fy2) *fy2 = 1; + if (fz2) + *fz2 = 1; } } } +void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2) +{ + R_FragmentLocation3D(rt, x, y, NULL, fx1, fy1, NULL, fx2, fy2, NULL); +} + int R_CompatibleFragmentWidth(int width, int textype, int flags) { - textypeinfo_t *texinfo = R_GetTexTypeInfo(textype, flags); - while ((width * texinfo->internalbytesperpixel) & 3) - width++; return width; } @@ -1008,7 +1206,7 @@ void R_UpdateTexture(rtexture_t *rt, qbyte *data) // if it has not been uploaded yet, update the data that will be used when it is if (glt->inputtexels) - memcpy(glt->inputtexels, data, glt->width * glt->height * glt->textype->inputbytesperpixel); + memcpy(glt->inputtexels, data, glt->inputdatasize); else R_Upload(glt, data); }