X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_textures.c;h=10cba22dd64283763d771ab38a33bf646648671e;hp=a2b005fae9391cd4a6554def3a746732c9d25edd;hb=bc8b80ee19f7a87e326fa765427d0c4e8dfe9940;hpb=b0671fcac8564a24ec6d499c0a574d71d937ea7d diff --git a/gl_textures.c b/gl_textures.c index a2b005fa..10cba22d 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -18,15 +18,12 @@ static mempool_t *textureprocessingmempool; // note: this must not conflict with TEXF_ flags in r_textures.h // cleared when a texture is uploaded #define GLTEXF_UPLOAD 0x00010000 -// texture generated by code, also causes permanent GLTEXF_UPLOAD effect -#define GLTEXF_PROCEDURAL 0x00020000 // bitmask for mismatch checking -#define GLTEXF_IMPORTANTBITS (GLTEXF_PROCEDURAL) +#define GLTEXF_IMPORTANTBITS (0) // set when image is uploaded and freed #define GLTEXF_DESTROYED 0x00040000 // size of images which hold fragment textures, ignores picmip and max_size -//#define BLOCK_SIZE 256 static int block_size; // really this number only governs gltexnuminuse @@ -76,6 +73,10 @@ gltextureimage_t; typedef struct gltexture_s { + // this field is exposed to the R_GetTexture macro, for speed reasons + // (must be identical in rtexture_t) + int texnum; // GL texture slot number + // pointer to texturepool (check this to see if the texture is allocated) struct gltexturepool_s *pool; // pointer to next texture in texturepool chain @@ -90,17 +91,9 @@ typedef struct gltexture_s qbyte *inputtexels; // to identify cache mismatchs (this might be removed someday) int crc; - // flags supplied to the LoadTexture/ProceduralTexture functions + // flags supplied to the LoadTexture function // (might be altered to remove TEXF_ALPHA), and GLTEXF_ private flags int flags; - // procedural texture generation function, called once per frame if the texture is used - int (*generate)(qbyte *buffer, int width, int height, void *parameterdata, int parameterdatasize); - // data provided to generate, persistent from call to call - qbyte *proceduraldata; - // size of data - int proceduraldatasize; - // used only to avoid updating the texture more than once per frame - int proceduralframecount; // pointer to one of the textype_ structs textypeinfo_t *textype; } @@ -179,26 +172,19 @@ static void R_PrecacheTexture(gltexture_t *glt) R_UploadTexture(glt); } -int R_GetTexture(rtexture_t *rt) +int R_RealGetTexture(rtexture_t *rt) { - gltexture_t *glt; - if (!rt) - return 0; - glt = (gltexture_t *)rt; - if (glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL)) + if (rt) { - if (glt->flags & GLTEXF_PROCEDURAL) - { - if (glt->proceduralframecount != r_framecount) - { - glt->proceduralframecount = r_framecount; - R_UploadTexture(glt); - } - } - else + gltexture_t *glt; + glt = (gltexture_t *)rt; + if (glt->flags & GLTEXF_UPLOAD) R_UploadTexture(glt); + glt->texnum = glt->image->texnum; + return glt->image->texnum; } - return glt->image->texnum; + else + return 0; } void R_FreeTexture(rtexture_t *rt) @@ -244,8 +230,6 @@ void R_FreeTexture(rtexture_t *rt) Mem_Free(glt->identifier); if (glt->inputtexels) Mem_Free(glt->inputtexels); - if (glt->proceduraldata) - Mem_Free(glt->proceduraldata); Mem_Free(glt); } @@ -448,10 +432,7 @@ static void R_TextureStats_f(void) for (glt = pool->gltchain;glt;glt = glt->chain) { loaded = !(glt->flags & GLTEXF_UPLOAD); - if (glt->flags & GLTEXF_PROCEDURAL) - Con_Printf("%c%4i%c %4i PROC %s %s %s %s\n" , loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : ""); - else - Con_Printf("%c%4i%c%c%4i%c %04X %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, glt->inputtexels ? ']' : ' ', glt->crc, loaded ? "loaded" : " ", (glt->flags & TEXF_MIPMAP) ? "mip" : " ", (glt->flags & TEXF_ALPHA) ? "alpha" : " ", glt->identifier ? glt->identifier : ""); + 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("pool %10p\n", pool); } @@ -569,6 +550,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer); CHECKGLERROR + glt->texnum = glt->image->texnum; return; } @@ -653,6 +635,7 @@ static void R_Upload(gltexture_t *glt, qbyte *data) qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag); CHECKGLERROR } + glt->texnum = glt->image->texnum; } static void R_FindImageForTexture(gltexture_t *glt) @@ -664,6 +647,9 @@ static void R_FindImageForTexture(gltexture_t *glt) texinfo = glt->textype; pool = glt->pool; + // remains -1 until uploaded + glt->texnum = -1; + x = 0; y = 0; w = glt->width; @@ -677,10 +663,11 @@ static void R_FindImageForTexture(gltexture_t *glt) continue; if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat) continue; + if (glt->width > image->width || glt->height > image->height) + continue; // got a fragments texture, find a place in it if we can - best = block_size; - for (best = block_size, i = 0;i < block_size - w;i += texinfo->align) + for (best = image->width, i = 0;i < image->width - w;i += texinfo->align) { for (best2 = 0, j = 0;j < w;j++) { @@ -697,7 +684,7 @@ static void R_FindImageForTexture(gltexture_t *glt) } } - if (best + h > block_size) + if (best + h > image->height) continue; for (i = 0;i < w;i++) @@ -714,10 +701,11 @@ static void R_FindImageForTexture(gltexture_t *glt) if (image == NULL) Sys_Error("R_FindImageForTexture: ran out of memory\n"); image->type = GLIMAGETYPE_FRAGMENTS; - image->width = block_size; - image->height = block_size; - image->blockallocation = Mem_Alloc(texturemempool, block_size * sizeof(short)); - memset(image->blockallocation, 0, block_size * sizeof(short)); + // 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->blockallocation = Mem_Alloc(texturemempool, image->width * sizeof(short)); + memset(image->blockallocation, 0, image->width * sizeof(short)); x = 0; y = 0; @@ -766,39 +754,21 @@ static void R_FindImageForTexture(gltexture_t *glt) // note: R_FindImageForTexture must be called before this static void R_UploadTexture (gltexture_t *glt) { - if (!(glt->flags & (GLTEXF_UPLOAD | GLTEXF_PROCEDURAL))) + if (!(glt->flags & GLTEXF_UPLOAD)) return; - if (glt->flags & GLTEXF_PROCEDURAL) - { - if (glt->generate) - { - if (texturebuffersize < glt->width * glt->height * glt->textype->inputbytesperpixel) - { - if (texturebuffer) - Mem_Free(texturebuffer); - texturebuffersize = glt->width * glt->height * glt->textype->inputbytesperpixel; - texturebuffer = Mem_Alloc(textureprocessingmempool, texturebuffersize); - } - - glt->generate(texturebuffer, glt->width, glt->height, (void *)glt->proceduraldata, glt->proceduraldatasize); - } - } - else + R_Upload(glt, glt->inputtexels); + if (glt->inputtexels) { - R_Upload(glt, glt->inputtexels); - if (glt->inputtexels) - { - Mem_Free(glt->inputtexels); - glt->inputtexels = NULL; - glt->flags |= GLTEXF_DESTROYED; - } - else if (glt->flags & GLTEXF_DESTROYED) - Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier); + Mem_Free(glt->inputtexels); + glt->inputtexels = NULL; + glt->flags |= GLTEXF_DESTROYED; } + else if (glt->flags & GLTEXF_DESTROYED) + Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed. Can not upload original image again. Uploaded blank texture.\n", glt->identifier); } -static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, qbyte *data, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize) +static 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)); @@ -828,17 +798,6 @@ static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int else glt->inputtexels = NULL; - glt->generate = generate; - glt->proceduraldatasize = proceduraldatasize; - if (proceduraldatasize) - { - glt->proceduraldata = Mem_Alloc(texturemempool, proceduraldatasize); - if (glt->proceduraldata == NULL) - Sys_Error("R_SetupTexture: out of memory\n"); - } - else - glt->proceduraldata = NULL; - R_FindImageForTexture(glt); R_PrecacheTexture(glt); @@ -864,12 +823,8 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w texinfo = R_GetTexTypeInfo(textype, flags); if (flags & TEXF_FRAGMENT) - { - if (width > block_size || height > block_size) - Host_Error("R_LoadTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size); if ((width * texinfo->internalbytesperpixel) & 3) Host_Error("R_LoadTexture: incompatible width for fragment"); - } // clear the alpha flag if the texture has no transparent pixels switch(textype) @@ -928,41 +883,7 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w R_FreeTexture((rtexture_t *)glt); } - return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data, NULL, NULL, 0); -} - -rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(qbyte *buffer, int width, int height, void *proceduraldata, int proceduraldatasize), void *proceduraldata, int proceduraldatasize) -{ - gltexture_t *glt; - gltexturepool_t *pool = (gltexturepool_t *)rtexturepool; - textypeinfo_t *texinfo; - - if (cls.state == ca_dedicated) - return NULL; - - texinfo = R_GetTexTypeInfo(textype, flags); - - if (flags & TEXF_FRAGMENT) - { - if (width > block_size || height > block_size) - Host_Error("R_ProceduralTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size); - if ((width * texinfo->internalbytesperpixel) & 3) - Host_Error("R_ProceduralTexture: incompatible width for fragment"); - } - - // see if the texture is already present - if (identifier && (glt = R_FindTexture(pool, identifier))) - { - if (width == glt->width && height == glt->height && texinfo == glt->textype && ((flags ^ glt->flags) & TEXF_IMPORTANTBITS) == 0 && ((flags ^ glt->flags) & GLTEXF_IMPORTANTBITS) == 0) - { - Con_Printf("R_LoadTexture: exact match with existing texture %s\n", identifier); - return (rtexture_t *)glt; // exact match, use existing - } - Con_Printf("R_LoadTexture: cache mismatch, replacing old texture\n"); - R_FreeTexture((rtexture_t *)glt); - } - - return (rtexture_t *)R_SetupTexture(pool, identifier, 0, width, height, flags | GLTEXF_PROCEDURAL | GLTEXF_UPLOAD, texinfo, NULL, generate, proceduraldata, proceduraldatasize); + return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data); } int R_TextureHasAlpha(rtexture_t *rt)