Add TEXF_PERSISTENT and R_PurgeTexture which only frees textures if that flag isn...

Fixed a bug that caused dynamic textures not to survive map switches (LoadExternal would try to load pixel data because ->base was set to NULL - it now restores the pointer in SkinFrame_Find..)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7737 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_gecko.c b/cl_gecko.c
index 9fd212937a0395df9c05173d9822971b2f7e735d..5885f8ab40e34f02a789e8b69cf47af54174ed23 100644 (file)
--- a/cl_gecko.c
+++ b/cl_gecko.c
@@ -68,7 +68,7 @@ static void cl_gecko_updatecallback( rtexture_t *texture, clgecko_t *instance )
 \r
 static void cl_gecko_linktexture( clgecko_t *instance ) {\r
        // TODO: assert that instance->texture == NULL\r
-       instance->texture = R_LoadTexture2D( cl_geckotexturepool, instance->name, DEFAULT_GECKO_WIDTH, DEFAULT_GECKO_HEIGHT, NULL, TEXTYPE_BGRA, TEXF_ALPHA, NULL );\r
+       instance->texture = R_LoadTexture2D( cl_geckotexturepool, instance->name, DEFAULT_GECKO_WIDTH, DEFAULT_GECKO_HEIGHT, NULL, TEXTYPE_BGRA, TEXF_ALPHA | TEXF_PERSISTENT, NULL );\r
        R_MakeTextureDynamic( instance->texture, cl_gecko_updatecallback, instance );\r
        CL_LinkDynTexture( instance->name, instance->texture );\r
 }\r

diff --git a/cl_video.c b/cl_video.c
index 2bfc51cff529549916a0c1e70df17b8f8e7082ed..a9f2fc4df6564d6f817c3b924acec305ea9e08c3 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -42,7 +42,7 @@ static void VideoUpdateCallback(rtexture_t *rt, void *data) {
 
 static void LinkVideoTexture( clvideo_t *video ) {
        video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
-               video->cpif.width, video->cpif.height, NULL, TEXTYPE_BGRA, TEXF_ALWAYSPRECACHE, NULL );
+               video->cpif.width, video->cpif.height, NULL, TEXTYPE_BGRA, TEXF_ALWAYSPRECACHE | TEXF_PERSISTENT, NULL );
        R_MakeTextureDynamic( video->cpif.tex, VideoUpdateCallback, video );
        CL_LinkDynTexture( video->cpif.name, video->cpif.tex );
 }

diff --git a/gl_rmain.c b/gl_rmain.c
index 852ce37acb50f46b8cdc34852e5c2d37b26f04e9..fb27c63bb7d836d52a319ae74f2598a46562e1b5 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -267,22 +267,22 @@ static void R_BuildBlankTextures(void)
        data[1] = 128; // normal Y
        data[0] = 255; // normal Z
        data[3] = 128; // height
-       r_texture_blanknormalmap = R_LoadTexture2D(r_main_texturepool, "blankbump", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE, NULL);
+       r_texture_blanknormalmap = R_LoadTexture2D(r_main_texturepool, "blankbump", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_PERSISTENT, NULL);
        data[0] = 255;
        data[1] = 255;
        data[2] = 255;
        data[3] = 255;
-       r_texture_white = R_LoadTexture2D(r_main_texturepool, "blankwhite", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE, NULL);
+       r_texture_white = R_LoadTexture2D(r_main_texturepool, "blankwhite", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_PERSISTENT, NULL);
        data[0] = 128;
        data[1] = 128;
        data[2] = 128;
        data[3] = 255;
-       r_texture_grey128 = R_LoadTexture2D(r_main_texturepool, "blankgrey128", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE, NULL);
+       r_texture_grey128 = R_LoadTexture2D(r_main_texturepool, "blankgrey128", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_PERSISTENT, NULL);
        data[0] = 0;
        data[1] = 0;
        data[2] = 0;
        data[3] = 255;
-       r_texture_black = R_LoadTexture2D(r_main_texturepool, "blankblack", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE, NULL);
+       r_texture_black = R_LoadTexture2D(r_main_texturepool, "blankblack", 1, 1, data, TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_PERSISTENT, NULL);
 }
 
 static void R_BuildNoTexture(void)
@@ -310,14 +310,14 @@ static void R_BuildNoTexture(void)
                        }
                }
        }
-       r_texture_notexture = R_LoadTexture2D(r_main_texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP, NULL);
+       r_texture_notexture = R_LoadTexture2D(r_main_texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_BGRA, TEXF_MIPMAP | TEXF_PERSISTENT, NULL);
 }
 
 static void R_BuildWhiteCube(void)
 {
        unsigned char data[6*1*1*4];
        memset(data, 255, sizeof(data));
-       r_texture_whitecube = R_LoadTextureCubeMap(r_main_texturepool, "whitecube", 1, data, TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_CLAMP, NULL);
+       r_texture_whitecube = R_LoadTextureCubeMap(r_main_texturepool, "whitecube", 1, data, TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_CLAMP | TEXF_PERSISTENT, NULL);
 }
 
 static void R_BuildNormalizationCube(void)
@@ -377,7 +377,7 @@ static void R_BuildNormalizationCube(void)
                        }
                }
        }
-       r_texture_normalizationcube = R_LoadTextureCubeMap(r_main_texturepool, "normalcube", NORMSIZE, &data[0][0][0][0], TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_CLAMP, NULL);
+       r_texture_normalizationcube = R_LoadTextureCubeMap(r_main_texturepool, "normalcube", NORMSIZE, &data[0][0][0][0], TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_CLAMP | TEXF_PERSISTENT, NULL);
 }
 
 static void R_BuildFogTexture(void)
@@ -398,7 +398,7 @@ static void R_BuildFogTexture(void)
                //data2[x][2] = 255 - b;
                //data2[x][3] = 255;
        }
-       r_texture_fogattenuation = R_LoadTexture2D(r_main_texturepool, "fogattenuation", FOGWIDTH, 1, &data1[0][0], TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_FORCELINEAR | TEXF_CLAMP, NULL);
+       r_texture_fogattenuation = R_LoadTexture2D(r_main_texturepool, "fogattenuation", FOGWIDTH, 1, &data1[0][0], TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_FORCELINEAR | TEXF_CLAMP | TEXF_PERSISTENT, NULL);
        //r_texture_fogintensity = R_LoadTexture2D(r_main_texturepool, "fogintensity", FOGWIDTH, 1, &data2[0][0], TEXTYPE_BGRA, TEXF_PRECACHE | TEXF_FORCELINEAR | TEXF_CLAMP, NULL);
 }
 
@@ -1472,18 +1472,18 @@ void R_SkinFrame_Purge(void)
                {
                        if (s->loadsequence && s->loadsequence != r_skinframe.loadsequence)
                        {
-                               if (s->base == r_texture_notexture)     s->base   = NULL;
-                               if (s->nmap == r_texture_blanknormalmap)s->nmap   = NULL;
-                               if (s->merged == s->base)               s->merged = NULL;
-                               if (s->stain ) R_FreeTexture(s->stain );s->stain  = NULL;
-                               if (s->merged) R_FreeTexture(s->merged);s->merged = NULL;
-                               if (s->base  ) R_FreeTexture(s->base  );s->base   = NULL;
-                               if (s->pants ) R_FreeTexture(s->pants );s->pants  = NULL;
-                               if (s->shirt ) R_FreeTexture(s->shirt );s->shirt  = NULL;
-                               if (s->nmap  ) R_FreeTexture(s->nmap  );s->nmap   = NULL;
-                               if (s->gloss ) R_FreeTexture(s->gloss );s->gloss  = NULL;
-                               if (s->glow  ) R_FreeTexture(s->glow  );s->glow   = NULL;
-                               if (s->fog   ) R_FreeTexture(s->fog   );s->fog    = NULL;
+                               if (s->merged == s->base)
+                                       s->merged = NULL;
+                               // FIXME: maybe pass a pointer to the pointer to R_PurgeTexture and reset it to NULL inside? [11/29/2007 Black]
+                               R_PurgeTexture(s->stain );s->stain  = NULL;
+                               R_PurgeTexture(s->merged);s->merged = NULL;
+                               R_PurgeTexture(s->base  );s->base   = NULL;
+                               R_PurgeTexture(s->pants );s->pants  = NULL;
+                               R_PurgeTexture(s->shirt );s->shirt  = NULL;
+                               R_PurgeTexture(s->nmap  );s->nmap   = NULL;
+                               R_PurgeTexture(s->gloss );s->gloss  = NULL;
+                               R_PurgeTexture(s->glow  );s->glow   = NULL;
+                               R_PurgeTexture(s->fog   );s->fog    = NULL;
                                s->loadsequence = 0;
                        }
                }
@@ -1518,15 +1518,15 @@ skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewid
        skinframe_t *item;
        int hashindex;
        char basename[MAX_QPATH];
-
+       
        Image_StripImageExtension(name, basename, sizeof(basename));
 
        hashindex = CRC_Block((unsigned char *)basename, strlen(basename)) & (SKINFRAME_HASH - 1);
        for (item = r_skinframe.hash[hashindex];item;item = item->next)
                if (!strcmp(item->basename, basename) && item->textureflags == textureflags && item->comparewidth == comparewidth && item->compareheight == compareheight && item->comparecrc == comparecrc)
                        break;
-       if (!item)
-       {
+
+       if (!item) {
                rtexture_t *dyntexture;
                // check whether its a dynamic texture
                dyntexture = CL_GetDynTexture( basename );
@@ -1535,14 +1535,23 @@ skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewid
                item = (skinframe_t *)Mem_ExpandableArray_AllocRecord(&r_skinframe.array);
                memset(item, 0, sizeof(*item));
                strlcpy(item->basename, basename, sizeof(item->basename));
+               item->base = dyntexture; // either NULL or dyntexture handle
                item->textureflags = textureflags;
-               item->base = dyntexture;
                item->comparewidth = comparewidth;
                item->compareheight = compareheight;
                item->comparecrc = comparecrc;
                item->next = r_skinframe.hash[hashindex];       
                r_skinframe.hash[hashindex] = item;
        }
+       else if( item->base == NULL )
+       {
+               rtexture_t *dyntexture;
+               // check whether its a dynamic texture
+               // this only needs to be done because Purge doesnt delete skinframes - only sets the texture pointers to NULL and we need to restore it before returing.. [11/29/2007 Black]
+               dyntexture = CL_GetDynTexture( basename );
+               item->base = dyntexture; // either NULL or dyntexture handle
+       }
+
        R_SkinFrame_MarkUsed(item);
        return item;
 }

diff --git a/gl_textures.c b/gl_textures.c
index ab6b92478f7e2d2620ce044a00c18955fdb28260..a55660409cd4bb7b702dae60a3f3eee91d009d4d 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -287,6 +287,13 @@ int R_RealGetTexture(rtexture_t *rt)
                return 0;
 }
 
+void R_PurgeTexture(rtexture_t *rt)
+{
+       if(rt && !(((gltexture_t*) rt)->flags & TEXF_PERSISTENT)) {
+               R_FreeTexture(rt);
+       }
+}
+
 void R_FreeTexture(rtexture_t *rt)
 {
        gltexture_t *glt, **gltpointer;

diff --git a/r_textures.h b/r_textures.h
index f83aba32122f066cf5f1df754274ff2cf5f887f5..aac4bdec1d031cfd358e30e5958a1570f9e9c295 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -20,6 +20,8 @@
 #define TEXF_PICMIP 0x00000100
 // indicates texture should be compressed if possible
 #define TEXF_COMPRESS 0x00000200
+// use this flag to block R_PurgeTexture from freeing a texture
+#define TEXF_PERSISTENT 0x00000400
 // used for checking if textures mismatch
 #define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR | TEXF_PICMIP | TEXF_COMPRESS)
 
@@ -97,12 +99,16 @@ int R_TextureWidth(rtexture_t *rt);
 // returns height of texture, as was specified when it was uploaded
 int R_TextureHeight(rtexture_t *rt);
 
+// only frees the texture if TEXF_PERSISTENT is not set
+// also resets the variable
+void R_PurgeTexture(rtexture_t *prt);
+
 // frees processing buffers each frame, and may someday animate procedural textures
 void R_Textures_Frame(void);
 
 // maybe rename this - sounds awful? [11/21/2007 Black]
 void R_MarkDirtyTexture(rtexture_t *rt);
-void R_MakeTextureDynamic(rtexture_t *rt, updatecallback_t updatecallback, void *data); 
+void R_MakeTextureDynamic(rtexture_t *rt, updatecallback_t updatecallback, void *data);
 
 #endif