]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
add a (yet unused) CACHEPICFLAG_MIPMAP
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 24 Jan 2012 20:41:27 +0000 (20:41 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Jan 2012 21:50:20 +0000 (22:50 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11653 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a3ec15442c0a70e559a0f46167bd7a5d311871cf

draw.h
gl_draw.c

diff --git a/draw.h b/draw.h
index 5cb62afa8f84919e53099963aa68b25ac6170be5..471efedd4ec78a522b28d1146ba490f2de88e271 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -56,7 +56,8 @@ typedef enum cachepicflags_e
        CACHEPICFLAG_QUIET = 2,
        CACHEPICFLAG_NOCOMPRESSION = 4,
        CACHEPICFLAG_NOCLAMP = 8,
-       CACHEPICFLAG_NEWPIC = 16 // disables matching texflags check, because a pic created with Draw_NewPic should not be subject to that
+       CACHEPICFLAG_NEWPIC = 16, // disables matching texflags check, because a pic created with Draw_NewPic should not be subject to that
+       CACHEPICFLAG_MIPMAP = 32
 }
 cachepicflags_t;
 
index 05d6c92527fefa1c570359d3a4e8e84f51f90981..127a0b377c8c30fc299255750095d971a8c78cae 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -328,6 +328,8 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
        texflags = TEXF_ALPHA;
        if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
                texflags |= TEXF_CLAMP;
+       if (cachepicflags & CACHEPICFLAG_MIPMAP)
+               texflags |= TEXF_MIPMAP;
        if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer && gl_texturecompression.integer)
                texflags |= TEXF_COMPRESS;