added TEXF_ALWAYSPRECACHE

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

diff --git a/gl_textures.c b/gl_textures.c
index 4cc437b64abae1c433f7bc4d6efec078f35ad4a1..3cc49e4d4db659d183387cb680166029f5b408b2 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -699,7 +699,9 @@ GL_LoadTexture_setup:
        glt->texeldatasize = R_CalcTexelDataSize(width, height, flags & TEXF_MIPMAP);
 
        precache = false;
-       if (r_precachetextures.value >= 1)
+       if (flags & TEXF_ALWAYSPRECACHE)
+               precache = true;
+       else if (r_precachetextures.value >= 1)
        {
                if (flags & TEXF_PRECACHE)
                        precache = true;

diff --git a/r_textures.h b/r_textures.h
index 9657fadf14fc9cbb33c6c5eb88bc5918c7bdc41b..9cfcca3e76d8c0a06184301707ece27d9bda021b 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -3,6 +3,7 @@
 #define TEXF_MIPMAP 2 // mipmapped
 #define TEXF_RGBA 4 // 32bit RGBA, as opposed to 8bit paletted
 #define TEXF_PRECACHE 8 // upload immediately, otherwise defer loading until it is used (r_textureprecache can override this)
+#define TEXF_ALWAYSPRECACHE 16 // upload immediately, never defer (ignore r_textureprecache)
 
 // contents of this structure are private to gl_textures.c
 typedef struct rtexture_s